From 4669a02db9b99fba0d2aed16f740214acef9a138 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 13 Mar 2026 14:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=8C=85=E5=90=AB=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/modules/ecss/mapper/CoDelMapper.java     | 2 ++
 .../sys/modules/ecss/service/impl/CoDelServiceImpl.java    | 5 +++++
 src/main/resources/mapper/ecss/CoDelMapper.xml             | 7 ++++++-
 src/main/resources/mapper/ecss/EcssCommonMapper.xml        | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java
index 29447dae..893cfd2b 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java
@@ -62,6 +62,8 @@ public interface CoDelMapper {
 
     void updateEcssDelDetailSurplusQty(EcssCoDelNotifyHeaderData data);
 
+    void restoreEcssDelDetailSurplusQty(EcssCoDelNotifyHeaderData data);
+
     void updateEcssDelDetailStatus(EcssCoDelNotifyHeaderData data);
     void recoverEcssDelDetailStatus(EcssCoDelNotifyHeaderData data);
 
diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
index 06d0f6c0..99fac891 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
@@ -296,6 +296,11 @@ public class CoDelServiceImpl implements CoDelService {
         coDelMapper.updateEcssDelHeaderForModify(header);
         // 改单导入后的状态处理逻辑 - 删除发货涉及PN/Qty变化（删除PN）
         handleNotifyStatusAfterModify(checkHeader.get(0), true);
+        // 装箱数据全部删除，恢复该发货通知单下所有有效明细的剩余数量，以便重新装箱
+        EcssCoDelNotifyHeaderData restoreData = new EcssCoDelNotifyHeaderData();
+        restoreData.setSite(data.getSite());
+        restoreData.setDelNo(data.getDelNo());
+        coDelMapper.restoreEcssDelDetailSurplusQty(restoreData);
         // 改单取消某条订单 通知仓库和单证人员
         //设置邮件内容
         String text = "<!DOCTYPE>" + "<div>发货通知单" +data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】改单" + "</div>"+
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 10a7664b..dbc2b25f 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -277,6 +277,11 @@
         update ecss_CoDelNotifyDetail set surplus_qty=0 where site=#{site} and delNo=#{delNo}
     </update>
 
+    <update id="restoreEcssDelDetailSurplusQty" >
+        update ecss_CoDelNotifyDetail set surplus_qty=qty
+        where site=#{site} and delNo=#{delNo} and status != '取消发货'
+    </update>
+
     <update id="changeEcssDelStatus">
         update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag},
                                           fscFlag=#{fscFlag},boxSizeFlag=#{boxSizeFlag} where site=#{site} and delNo=#{delNo}
@@ -881,7 +886,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
 
     <select id="exportDeclarationDetail" resultType="java.util.Map">
         select detail.site,detail.declaration_no,detail.item_no,
-               CONVERT(DECIMAL(20, 0), detail.qty) as qty,isnull(h.unit,'') as qty_unit,'kg' as weight_unit,
+               CONVERT(DECIMAL(20, 6), detail.qty) as qty,isnull(h.unit,'') as qty_unit,'kg' as weight_unit,
                CONVERT(DECIMAL(20, 2),detail.net_weight) as net_weight,CONVERT(DECIMAL(20, 6),detail.unit_price) as unit_price,
                CONVERT(DECIMAL(20, 2),detail.total_price) as total_price,detail.currency,detail.made_area,detail.destination,
                detail.source_area,detail.levy,detail.hs_code,detail.hs_code_desc,h.hsCodeDescEn
diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
index e4be024e..d12617b2 100644
--- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml
+++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
@@ -141,6 +141,7 @@
 		<where>
 			And a.site = #{site}
 			AND a.delNo = #{delNo}
+			and a.status != '取消发货'
 		</where>
 		order by a.item_no
 	</select>