From d6ec6a33b121bd65f1c492bc20840b9accc72a61 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 4 Sep 2025 10:07:30 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20oms\=E5=B0=8F=E7=A8=8B=E5=BA=8F-?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5=E6=94=AF=E6=8C=81=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=A8=8E=E5=8F=B7=20=20oms\=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
 =?UTF-8?q?=20=20oms\=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9C=B0=E5=9D=80=E6=94=AF=E6=8C=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=A8=8E=E5=8F=B7=20=20oms\=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80=E6=94=AF=E6=8C=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?/=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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;
 
      }