From ff212cca71536082f52a9d9b54b1844208b3c4aa Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 9 Jun 2026 13:50:12 +0800
Subject: [PATCH] hsUnit

---
 .../xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java   | 2 +-
 src/main/resources/mapper/ecss/CoDelMapper.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 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 1f0586ae..7a57adfb 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
@@ -959,7 +959,7 @@ public class CoDelServiceImpl implements CoDelService {
                 }
                 for (Map detail : detailList) {
                     if (detail.get("hsCode").equals(data.getHsCode()) && detail.get("hsCodeDesc").equals(data.getHsCodeDesc()) && detail.get("brand").equals(data.getBrand())) {
-                        data.setUnit((String) detail.get("unit"));
+                        data.setUnit((String) detail.get("hsUnit"));
                         break;
                     }
                 }
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 4da79a7d..6837b5b7 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -933,7 +933,7 @@ create_by,create_date,update_by,update_date
     <select id="exportEcssCoDelNotifyDetail"  resultType="java.util.Map">
         select a.customerPO,a.part_no,a.part_description,LEFT(a.currency, 3) as currency,
                CONVERT(DECIMAL(20, 0), a.qty) as qty,CONVERT(DECIMAL(20, 6), a.tp) as unitPrice,b.hsCode,
-               a.upc,a.so,a.ttl_amount,a.pn,b.hsCodeDesc,h.hsCodeDescEn,a.salesOrder,b.umid as unit,b.brand
+               a.upc,a.so,a.ttl_amount,a.pn,b.hsCodeDesc,h.hsCodeDescEn,a.salesOrder,b.umid as unit,b.brand,h.unit as hsUnit
         from ecss_CoDelNotifydetail a
                  left join part b on a.site=b.site and a.part_no=b.part_no
                  left join ecss_hsCode h on b.hsCode=h.HsCode and a.site=h.site and b.hsCodeDesc=h.hsCodeDesc