From 4c719ac44b9ad39607f7d0a91ac0d4906162b8ef Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 10 Apr 2026 09:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8A=A5=E5=85=B3=E5=8D=95?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E5=93=81=E7=89=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98brand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/ecss/mapper/CoDelMapper.java    |  2 ++
 .../service/impl/CoDelExcelTXServiceImpl.java   |  2 +-
 src/main/resources/mapper/ecss/CoDelMapper.xml  | 17 +++++++++++++----
 3 files changed, 16 insertions(+), 5 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 967c2c48..43f9eeea 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
@@ -221,6 +221,8 @@ public interface CoDelMapper {
 
     List<Map> getNotifyDetailGroup(EcssDeclarationHeaderData data);
 
+    List<Map> getNotifyDetailGroupTX(EcssDeclarationHeaderData data);
+
     List<PartSubPropertiesValueData> getPropertiesListByTypeAndCodeNo(@Param("site") String site,@Param("recordType") String recordType,
                                                @Param("codeNo") String codeNo,@Param("buNo") String buNo,@Param("pn") String pn);
 
diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
index 0daf01a8..7d328666 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java
@@ -1953,7 +1953,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService {
         EcssCoDelNotifyHeaderData notifyHeader = coDelMapper.getEcssCoDelNotifyHeader(data.getSite(), data.getDelNo());
         template.addVar("cmcInvoice", notifyHeader.getCmcInvoice());
         template.addVar("readyDate", DateUtils.format(notifyHeader.getReadyDate(), "yyyy/MM/dd"));
-        List<Map> notifyDetailGroup = coDelMapper.getNotifyDetailGroup(data);
+        List<Map> notifyDetailGroup = coDelMapper.getNotifyDetailGroupTX(data);
         BigDecimal totalQty = BigDecimal.ZERO;
         BigDecimal totalAmount = BigDecimal.ZERO;
         for (int i = 0; i < notifyDetailGroup.size(); i++) {
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 3c9809a1..959151b2 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -685,9 +685,9 @@ create_by,create_date,update_by,update_date
     </insert>
 
     <insert id="saveEcssDeclarationDetail">
-        insert into ecss_declaration_detail(site,declaration_no,item_no,hs_code,hs_code_desc,qty,net_weight,unit_price,total_price,currency,made_area,destination,
+        insert into ecss_declaration_detail(site,declaration_no,item_no,hs_code,hs_code_desc,brand,qty,net_weight,unit_price,total_price,currency,made_area,destination,
                                             source_area,levy)
-            values(#{site},#{declarationNo},#{itemNo,jdbcType=INTEGER},#{hsCode},#{hsCodeDesc},#{qty,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{unitPrice,jdbcType=DECIMAL},#{totalPrice,jdbcType=DECIMAL},#{currency},#{madeArea},#{destination},
+            values(#{site},#{declarationNo},#{itemNo,jdbcType=INTEGER},#{hsCode},#{hsCodeDesc},#{brand,jdbcType=NVARCHAR},#{qty,jdbcType=DECIMAL},#{netWeight,jdbcType=DECIMAL},#{unitPrice,jdbcType=DECIMAL},#{totalPrice,jdbcType=DECIMAL},#{currency},#{madeArea},#{destination},
         #{sourceArea},#{levy})
     </insert>
     <select id="searchDeclarationHeader"   resultType="EcssDeclarationHeaderData">
@@ -730,8 +730,8 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
     </select>
 
     <select id="searchDeclarationDetail" resultType="EcssDeclarationDetailData">
-       select  site,declaration_no,item_no,hs_code,hs_code_desc,qty,net_weight,unit_price,total_price,currency,made_area,destination,
-               source_area,levy
+       select  site,declaration_no,item_no,hs_code,hs_code_desc,brand,qty,net_weight,unit_price,total_price,currency,made_area,destination,
+               source_area,levy,brand
        from ecss_declaration_detail
         where site=#{site} and declaration_no=#{declarationNo}
     </select>
@@ -1079,6 +1079,15 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
         group by b.hsCodeDesc
     </select>
 
+    <select id="getNotifyDetailGroupTX"  resultType="java.util.Map">
+        select b.hsCodeDesc,CONVERT(DECIMAL(20, 2),sum(a.qty)) as total_qty,
+               CONVERT(DECIMAL(20, 2),sum(a.ttl_amount)) as ttl_amount
+        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
+        group by b.hsCodeDesc,b.brand
+    </select>
+
     <!-- 根据notifyDetailItemNo获取发货通知单明细 -->
     <select id="getEcssCoDelNotifyDetailByItemNo" resultType="EcssCoDelNotifyDetailData">
         select a.site,a.bu_no,a.delNo,a.item_no,a.salesOrder,a.salesOrder_item_no,a.customerPO,a.line,a.version,a.status,a.family,