From d5a5db16d3a5942dd8985f0ec8e4a2abdabb17af Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 24 Feb 2026 13:48:17 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20tms-=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=97=B6=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=AF=E6=9C=AA=E6=8E=A5=E5=8D=95=E5=92=8C=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=9A=84=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=97=A5=E6=9C=9F=E7=BD=AE=E7=A9=BA=20=20tms-?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8-=E6=8E=A5=E5=8D=95=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=8D=95=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 48de1dd5e..2b5b21687 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
@@ -285,7 +285,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     {
         // lastTraceInfo
         List<EmisWaybill>  list=emisWaybillMapper.selectOrderList(emisWaybill);
-
+        if (list != null && !list.isEmpty()) {
+            for (EmisWaybill item : list) {
+                // 如果订单状态不为1，则将发货时间置空
+                if (item != null && item.getOrderStatus() != null && !"1".equals(item.getOrderStatus())) {
+                    item.setSendDate(null);
+                }
+            }
+        }
         return list;
     }
 
@@ -1823,6 +1830,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 公共计算部分
         calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
+        emisWaybillSave.setOrderDate(null);
 
 
         // 变为已接单