From 34e66c3d61980fceea135ae0631d3edffbda02bb Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 27 Aug 2025 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?boxqty=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/modules/ecss/mapper/CoDelMapper.java | 10 ++++++----
 .../modules/ecss/service/impl/CoDelServiceImpl.java    |  3 ++-
 src/main/resources/mapper/ecss/CoDelMapper.xml         |  8 +++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

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 b1b28c78..60825c17 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
@@ -174,6 +174,8 @@ public interface CoDelMapper {
 
     List<Map> exportCoDelPalletDetail(EcssCoDelNotifyHeaderData data);
 
+    List<Map> exportCoDelBoxList(EcssCoDelNotifyHeaderData data);
+
     void updateEcssDeclarationHeader(EcssDeclarationHeaderData data);
 
     void updateEcssCoDelNotifyDetail(EcssCoDelNotifyDetailData data);
@@ -240,10 +242,10 @@ public interface CoDelMapper {
     void deleteEmptyBoxAfterDetailDelete(EcssCoDelPalletData detailData);
 
     List<Map> selectPalletDetailList(EcssCoDelPalletHeaderData inData);
-    
+
     // 根据notifyDetailItemNo获取发货通知单明细
-    EcssCoDelNotifyDetailData getEcssCoDelNotifyDetailByItemNo(@Param("site") String site, 
-                                                               @Param("buNo") String buNo, 
-                                                               @Param("delNo") String delNo, 
+    EcssCoDelNotifyDetailData getEcssCoDelNotifyDetailByItemNo(@Param("site") String site,
+                                                               @Param("buNo") String buNo,
+                                                               @Param("delNo") String delNo,
                                                                @Param("notifyDetailItemNo") Integer notifyDetailItemNo);
 }
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 09a04e05..cf4e9257 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
@@ -1195,7 +1195,8 @@ public class CoDelServiceImpl implements CoDelService {
         List<EcssCoDelPalletHeaderData> palletHeaderDataList = coDelMapper.searchEcssCoDelPalletHeaderData(notifyHeaderData);
         List<Map> palletDetailList = coDelMapper.exportCoDelPalletDetail(notifyHeaderData);
         defaultData.setPackageQty(palletHeaderDataList.isEmpty()?0:palletHeaderDataList.get(0).getPalletQty());
-        defaultData.setBoxQty(palletDetailList.stream().mapToInt(o->Integer.parseInt(o.get("box_qty").toString())).sum());
+        List<Map> boxList = coDelMapper.exportCoDelBoxList(notifyHeaderData);
+        defaultData.setBoxQty(boxList.stream().mapToInt(o->Integer.parseInt(o.get("box_qty").toString())).sum());
         map.put("row", defaultData);
         Map<String, EcssDeclarationDetailData> dataMap = rows.stream()
                 .collect(Collectors.toMap(o -> o.getHsCodeDesc() + "$" + o.getHsCode(), o -> o));
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 6cdc7980..60e413ca 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -793,7 +793,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
 
     <select id="exportCoDelPalletDetail" resultType="java.util.Map">
         select b.part_no,CONVERT(DECIMAL(20, 0),sum(b.qty)) as total_qty,
-               CONVERT(DECIMAL(20, 0),sum(DISTINCT b.box_qty)) as box_qty,
+               CONVERT(DECIMAL(20, 0),sum(DISTINCT a.box_qty)) as box_qty,
                CONVERT(DECIMAL(20, 0),sum(b.rolls)) as rolls,
                CONVERT(DECIMAL(20, 2),sum(a.net_weight)) as net_weight,
                CONVERT(DECIMAL(20, 2),sum(a.gross_weight)) as gross_weight,
@@ -803,6 +803,12 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
         where a.site=#{site} and a.bu_no=#{buNo} and a.delNo=#{delNo} and b.site is not null GROUP BY b.part_no
     </select>
 
+    <select id="exportCoDelBoxList" resultType="java.util.Map">
+        select CONVERT(DECIMAL(20, 0),sum(a.box_qty)) as box_qty
+        from ecss_CoDelBoxList a
+        where a.site=#{site} and a.bu_no=#{buNo} and a.delNo=#{delNo}  GROUP BY a.item_no
+    </select>
+
     <update id="updateEcssDeclarationHeader" >
         update ecss_declaration_header set
             upc=#{upc},so=#{so},origin=#{origin},pallet_weight=#{palletWeight},material=#{material},