aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-04 21:57:54 +08:00
parent 3d42bc4338
commit 7af524588c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1169,7 +1169,7 @@ public class EmisBaseService {
EmisTransProduct emisTransProduct = getTransProductByCode(prodCode); EmisTransProduct emisTransProduct = getTransProductByCode(prodCode);
// 预估到达时间 startData+最大时效 // 预估到达时间 startData+最大时效
Date endDate = DateUtils.addDays(startDate, emisTransProduct.getMaxAging()); Date endDate = DateUtils.addDays(startDate, emisTransProduct.getMaxAging()-1);
// 计算周末 // 计算周末
int weekDays = computeWeekDays(startDate,endDate,true); int weekDays = computeWeekDays(startDate,endDate,true);
@ -1182,7 +1182,7 @@ public class EmisBaseService {
endDate); endDate);
// 1+1+ // 1+1+
int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays; int totalDays=(emisTransProduct.getMaxAging()-1)+weekDays+notCaclDays;
log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays); log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays);
// 预估达到时间 // 预估达到时间
return DateUtils.addDays(startDate, totalDays); return DateUtils.addDays(startDate, totalDays);

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -452,7 +452,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 寄付和其他 // 寄付和其他
else{ else{
// 通过电话判断客户是否存在 // 通过电话判断客户是否存在
String sendPhone=getCompletePhone(sendAddress.getCounty(),sendAddress.getPhone()) String sendPhone=getCompletePhone(sendAddress.getCounty(),sendAddress.getPhone());
EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone); EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone);
if(emisCustomerUser!=null){ if(emisCustomerUser!=null){
customerCode=emisCustomerUser.getCustomerCode(); customerCode=emisCustomerUser.getCustomerCode();
@ -509,8 +509,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
// 开单当天不算时效 // 开单当天不算时效
Date startDate = emisWaybillSave.getSendDate();
Date estDate = getEstimateDate( Date estDate = getEstimateDate(
emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(), emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(),
emisWaybillSave.getSendCountry(), emisWaybillSave.getSendCountry(),