diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 75b2b4a59..b4682b14a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1169,7 +1169,7 @@ public class EmisBaseService { EmisTransProduct emisTransProduct = getTransProductByCode(prodCode); // 预估到达时间 startData+最大时效 - Date endDate = DateUtils.addDays(startDate, emisTransProduct.getMaxAging()); + Date endDate = DateUtils.addDays(startDate, emisTransProduct.getMaxAging()-1); // 计算周末 int weekDays = computeWeekDays(startDate,endDate,true); @@ -1182,7 +1182,7 @@ public class EmisBaseService { endDate); // 1+1+ - int totalDays=emisTransProduct.getMaxAging()+weekDays+notCaclDays; + int totalDays=(emisTransProduct.getMaxAging()-1)+weekDays+notCaclDays; log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays); // 预估达到时间 return DateUtils.addDays(startDate, totalDays); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 12845de8d..ebb46af75 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -452,7 +452,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 寄付和其他 else{ // 通过电话判断客户是否存在 - String sendPhone=getCompletePhone(sendAddress.getCounty(),sendAddress.getPhone()) + String sendPhone=getCompletePhone(sendAddress.getCounty(),sendAddress.getPhone()); EmisCustomerUser emisCustomerUser=getCustomerUserByPhone(sendPhone); if(emisCustomerUser!=null){ customerCode=emisCustomerUser.getCustomerCode(); @@ -509,8 +509,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } // 开单当天不算时效 - Date startDate = emisWaybillSave.getSendDate(); - Date estDate = getEstimateDate( emisWaybillSave.getSendDate(),emisWaybillSave.getProductType(), emisWaybillSave.getSendCountry(),