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 6cf66c627..94f34ba18 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 @@ -4149,7 +4149,17 @@ public class EmisBaseService { int totalDays=(emisTransProduct.getMaxAging()+otherAddDay-1)+weekDays+notCaclDays; log.info("计算预估到达时间:[maxAging="+emisTransProduct.getMaxAging()+",weekDays="+weekDays+",notCaclDays="+notCaclDays); // 预估达到时间 - return DateUtils.addDays(startDate, totalDays); + Date estimateDate = DateUtils.addDays(startDate, totalDays); + + // 判断预估到达时间是否为周末,如果是周末则往后加一天 + Calendar cal = Calendar.getInstance(); + cal.setTime(estimateDate); + int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK); + if (dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY) { + estimateDate = DateUtils.addDays(estimateDate, 1); + } + + return estimateDate; }