From 737088544b13eacfb5e4cea91fcb59cb9975c13f Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 15 Oct 2025 10:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=9B=E9=87=8D=E5=87=80=E9=87=8D=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/modules/ecss/mapper/CoDelMapper.java    | 7 ++++---
 .../sys/modules/ecss/service/impl/CoDelServiceImpl.java   | 6 +++---
 src/main/resources/mapper/ecss/CoDelMapper.xml            | 8 ++++----
 3 files changed, 11 insertions(+), 10 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 fdb2a2a5..42884e34 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
@@ -121,10 +121,11 @@ public interface CoDelMapper {
                             @Param("seqNo") Integer seqNo,@Param("itemNo") Integer itemNo);
 
 
-    EcssCoDelPalletHeader getAllWeight( @Param("site") String site,@Param("delNo") String delNo);
+    EcssCoDelPalletHeader getAllWeight( @Param("site") String site,@Param("delNo") String delNo,
+                                       @Param("buNo") String buNo);
 
-    List<EcssDeclarationDetailData> getDefaultEcssDeclarationDetailData( @Param("site") String site,@Param("delNo") String delNo,@Param("destination") String destination);
-    List<EcssDeclarationDetailData> getDefaultEcssDeclarationDetailData2( @Param("site") String site,@Param("delNo") String delNo,@Param("destination") String destination);
+    List<EcssDeclarationDetailData> getDefaultEcssDeclarationDetailData( @Param("site") String site,@Param("delNo") String delNo,@Param("destination") String destination,@Param("buNo") String buNo);
+    List<EcssDeclarationDetailData> getDefaultEcssDeclarationDetailData2( @Param("site") String site,@Param("delNo") String delNo,@Param("destination") String destination,@Param("buNo") String buNo);
     void saveEcssDeclarationHeader(EcssDeclarationHeaderData inData);
     void saveEcssDeclarationDetail(EcssDeclarationDetailData inData);
 
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 0d66f877..81851884 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
@@ -1456,7 +1456,7 @@ public class CoDelServiceImpl implements CoDelService {
             notifyHeaderData = getCoDelNotifyHeaderData.get(0);
         }
         //获取重量
-        EcssCoDelPalletHeader getAllWeight = coDelMapper.getAllWeight(inData.getSite(), inData.getDelNo());
+        EcssCoDelPalletHeader getAllWeight = coDelMapper.getAllWeight(inData.getSite(), inData.getDelNo(),inData.getBuNo());
         if (getAllWeight == null) {
             throw new RuntimeException("发货通知单不存在装箱记录！");
         }
@@ -1483,7 +1483,7 @@ public class CoDelServiceImpl implements CoDelService {
         defaultData.setSalesArea(notifyHeaderData.getSalesArea());
         defaultData.setPackageType("再生木托/纸箱");
         List<EcssDeclarationDetailData> rows = coDelMapper.getDefaultEcssDeclarationDetailData(inData.getSite(), inData.getDelNo(),
-                notifyHeaderData.getCnative());
+                notifyHeaderData.getCnative(),inData.getBuNo());
         if (rows.isEmpty()) {
             throw new RuntimeException("不存在箱记录无法报关！");
         }
@@ -1521,7 +1521,7 @@ public class CoDelServiceImpl implements CoDelService {
         Map<String, EcssDeclarationDetailData> dataMap = rows.stream()
                 .collect(Collectors.toMap(o -> o.getHsCodeDesc() + "$" + o.getHsCode(), o -> o));
         List<EcssDeclarationDetailData> rows2 = coDelMapper.getDefaultEcssDeclarationDetailData2(inData.getSite(), inData.getDelNo(),
-                notifyHeaderData.getCnative());
+                notifyHeaderData.getCnative(),inData.getBuNo());
         EcssParamData paramData = new EcssParamData();
         for (EcssDeclarationDetailData data : rows2){
             data.setNetWeight(dataMap.get(data.getHsCodeDesc() + "$" + data.getHsCode()).getNetWeight());
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 5ccfbfb5..7cf541e0 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -543,15 +543,15 @@ create_by,create_date,update_by,update_date
 
     <select id="getAllWeight" resultType="com.xujie.sys.modules.ecss.entity.EcssCoDelPalletHeader">
          select sum(gross_weight) as gross_weight ,sum(net_weight) as net_weight from ecss_CoDelBoxList
-        where site =#{site} and delNo=#{delNo}
+        where site =#{site} and delNo=#{delNo} and bu_no=#{buNo}
     </select>
 
     <select id="getDefaultEcssDeclarationDetailData" resultType="EcssDeclarationDetailData">
-        select #{site} as site, b.hsCode,b.hsCodeDesc as hsCodeDesc,sum(a.qty) as qty,sum(distinct c.Net_Weight) as NetWeight
+        select #{site} as site, b.hsCode,b.hsCodeDesc as hsCodeDesc,sum(a.qty) as qty,sum( c.Net_Weight) as NetWeight
          ,'CNY' as currency,'中国' as madeArea,#{destination} as destination,'南通其他' as sourceArea  ,'照章征免' as levy
         from ecss_CoDelPalletDetail a left join part b on a.site=b.site and a.part_no=b.part_no
         left join ecss_CoDelBoxList c on a.site=c.site and a.delNo=c.delNo and a.seq_no=c.item_no
-        where a.site =#{site} and a.delNo=#{delNo}
+        where a.site =#{site} and a.delNo=#{delNo} and a.bu_no=#{buNo}
         GROUP BY  b.hsCodeDesc,b.hsCode
     </select>
 
@@ -560,7 +560,7 @@ create_by,create_date,update_by,update_date
                CONVERT(DECIMAL(20, 6),sum(a.ttl_amount)/sum( a.qty)) as  unitPrice,
              a.currency as currency,'中国' as madeArea,#{destination} as destination,'南通其他' as sourceArea  ,'照章征免' as levy  from
             ecss_CoDelNotifyDetail a left join part b on a.site=b.site and a.part_no=b.part_no
-        where a.site =#{site} and a.delNo=#{delNo} and a.qty>0
+        where a.site =#{site} and a.delNo=#{delNo} and a.qty>0  and a.bu_no=#{buNo}
         GROUP BY  b.hsCodeDesc,b.hsCode,a.currency
     </select>