From f374f77701b3eadf6226376871d66907639d4d92 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 6 Mar 2025 10:53:27 +0800
Subject: [PATCH] 666

---
 .../xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java | 3 +++
 src/main/resources/mapper/ecss/CoDelMapper.xml                | 4 ++--
 src/main/resources/mapper/part/PartInformationMapper.xml      | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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 f3ed7c87..327269dc 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
@@ -678,6 +678,9 @@ public class CoDelServiceImpl implements CoDelService {
         defaultData.setCreateBy(currentUser.getUsername());
         map.put("row",defaultData);
         List<EcssDeclarationDetailData> rows=coDelMapper.getDefaultEcssDeclarationDetailData(inData.getSite(),inData.getDelNo(),"客户收货人国家");
+        if(rows.size()==0){
+            throw new RuntimeException("不存在箱记录无法报关！");
+        }
         for (int i = 0; i < rows.size(); i++) {
             if(rows.get(i).getHsCode()==null){
                 throw new RuntimeException("存在物料未维护HSCODE！");
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 3935539f..54d3a7f9 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -443,12 +443,12 @@ create_by,create_date,update_by,update_date
     </select>
 
     <select id="getDefaultEcssDeclarationDetailData" resultType="EcssDeclarationDetailData">
-        select #{site} as site, b.hsCode,b.hsCode as hsCodeDesc,sum( a.qty) as qty , sum(c.Net_Weight*isnull(a.box_qty,1)) as NetWeight
+        select #{site} as site, b.hsCode,b.hsCodeDesc as hsCodeDesc,sum( a.qty) as qty , sum(c.Net_Weight*isnull(a.box_qty,1)) 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_CoDelPalletHeader c on a.site=c.site and a.delNo=c.delNo
         where a.site =#{site} and a.delNo=#{delNo}
-        GROUP BY  b.hsCode
+        GROUP BY  b.hsCode,b.hsCodeDesc
     </select>
 
     <insert id="saveEcssDeclarationHeader">
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index bf1d8f47..1563b829 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -103,7 +103,7 @@
         standard_cost_currency,
         actual_cost,
         actual_cost_currency,
-        hsCode,hsCode as hsCodeDesc
+        hsCode, hsCodeDesc
         FROM part
         <where>
             site in (select site from eam_access_site where username = #{query.userName})
@@ -1017,7 +1017,7 @@
     </insert>
 
     <update id="savePartHSCode">
-        update Part set hsCode=#{hsCode}
+        update Part set hsCode=#{hsCode},hsCodeDesc=#{hsCodeDesc}
         where site = #{site} and part_no = #{partNo}
     </update>
 </mapper>