From c7b977e8317d6a643a7c570307a629e80d9e0c46 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 2 Dec 2025 17:21:59 +0800
Subject: [PATCH] qtyBox

---
 .../sys/modules/ecss/data/EcssCoDelNotifyDetailData.java    | 2 ++
 src/main/resources/mapper/ecss/CoDelMapper.xml              | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java
index 3e96dd7a..e8835fea 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyDetailData.java
@@ -25,4 +25,6 @@ public class EcssCoDelNotifyDetailData extends EcssCoDelNotifyDetail {
     private BigDecimal useQty;
     private BigDecimal surplusQty;
     private String packageNo;
+    private String qtyRoll;
+    private String qtyBox;
 }
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 34f447bc..34b4fd23 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -119,7 +119,7 @@
         a.part_no,a.part_description,a.qty,a.lt,a.cmc_comment,a.saleType,a.awb_bl,a.shipping_number,a.forwarder_info,isnull(a.surplus_qty,0) surplusQty,
         a.currency,a.tp,a.ttl_amount,a.sum_price,a.so,a.upc,a.remark,a.erp_delItemNo,a.pn,CONVERT(DECIMAL(20, 0),a.nocartons) as nocartons,
         c.num_value as boxrolls,d.num_value as rollqty,w.num_value as boxweight,#{cmcInvoice} as cmcInvoice,a.modifyFlag,a.modifyQtyFlag,
-        b.hsCodeDesc,a.vat,a.roll,a.carton,b.packageNo
+        b.hsCodeDesc,a.vat,a.roll,a.carton,b.packageNo,a.qty_roll as qtyRoll,a.qty_box as qtyBox
        from ecss_CoDelNotifydetail a
            left join part b on a.site=b.site and a.part_no=b.part_no
            left join part_sub_properties_value c on a.part_no=c.part_no and c.site=a.site and c.bu_no=a.bu_no
@@ -598,10 +598,10 @@ create_by,create_date,update_by,update_date
     <select id="getDefaultEcssDeclarationDetailData2" resultType="EcssDeclarationDetailData">
         select #{site} as site, b.hsCode,b.hsCodeDesc as hsCodeDesc,sum( a.qty) as qty ,sum(a.ttl_amount) as totalPrice,
                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
+            LEFT(a.currency, 3) 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  and a.bu_no=#{buNo}
-        GROUP BY  b.hsCodeDesc,b.hsCode,a.currency
+        GROUP BY  b.hsCodeDesc,b.hsCode,LEFT(a.currency,3)
     </select>