From 9b7916b0772e30ad704a378e0033158ee4adf799 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Thu, 24 Apr 2025 14:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E6=98=8E=E7=BB=86=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=85=A8=E9=83=A8=E6=8C=89=E5=BA=8F=E5=8F=B7=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ecss/service/impl/CoDelServiceImpl.java       | 15 +++++++++------
 .../resources/mapper/ecss/EcssCommonMapper.xml    | 10 ++++++++++
 2 files changed, 19 insertions(+), 6 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 2037a86b..f76fe5ca 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
@@ -577,13 +577,16 @@ public class CoDelServiceImpl implements CoDelService {
                 EcssCoDelPalletData excelData = new EcssCoDelPalletData();
                 // 获得该行
                 XSSFRow row = sheet.getRow(j);
+                if ((inData.getWalMartOrderFlag()==null || inData.getWalMartOrderFlag().equals("N")) && row.getCell(0) == null) {
+                    throw new RuntimeException("第" + j + "行的序号不能为空!");
+                }
                 if (row.getCell(4) == null) {
                     throw new RuntimeException("第" + j + "行的PN不能为空!");
                 }
                 if (row.getCell(5) == null) {
                     throw new RuntimeException("第" + j + "行的数量不能为空!");
                 }
-                excelData.setSeqNo(getIntegerCellValue(row, 0));
+                excelData.setSeqNo((inData.getWalMartOrderFlag()!=null && inData.getWalMartOrderFlag().equals("Y"))?j:getIntegerCellValue(row, 0));
                 // 为对象赋值
                 excelData.setSite(inData.getSite()); // site
                 excelData.setBuNo(inData.getBuNo()); // bu
@@ -614,16 +617,16 @@ public class CoDelServiceImpl implements CoDelService {
             }
             // 如果是沃尔玛订单，按照pn分组，同一个pn是一个EcssCoDelPalletHeaderData，
             // 如果是非沃尔玛订单，按照序号分组，同一个序号是一个EcssCoDelPalletHeaderData，
-            Map<String, List<EcssCoDelPalletData>> palletListMap = new HashMap<>();
+            Map<Integer, List<EcssCoDelPalletData>> palletListMap = new HashMap<>();
             Map<Integer, List<EcssCoDelPalletData>> palletListMap2 = new HashMap<>();
             if (inData.getWalMartOrderFlag()!=null && inData.getWalMartOrderFlag().equals("Y")) {
                for (EcssCoDelPalletData itemData : excelList){
-                   if (palletListMap.containsKey(itemData.getPn())) {
-                       palletListMap.get(itemData.getPn()).add(itemData);
+                   if (palletListMap.containsKey(itemData.getSeqNo())) {
+                       palletListMap.get(itemData.getSeqNo()).add(itemData);
                    } else {
                        List<EcssCoDelPalletData> palletDataList = new ArrayList<>();
                        palletDataList.add(itemData);
-                       palletListMap.put(itemData.getPn(),palletDataList);
+                       palletListMap.put(itemData.getSeqNo(),palletDataList);
                    }
                }
             } else {
@@ -648,7 +651,7 @@ public class CoDelServiceImpl implements CoDelService {
             List<EcssCoDelPalletDetailData> detailList = new ArrayList<>();
             int seqNo = 0;
             // palletListMap里每一个key生成一个EcssCoDelPalletHeaderData，每一个value生成一组EcssCoDelPalletDetailData
-            for (Map.Entry<String, List<EcssCoDelPalletData>> entry : palletListMap.entrySet()) {
+            for (Map.Entry<Integer, List<EcssCoDelPalletData>> entry : palletListMap.entrySet()) {
                 seqNo++;
                 EcssCoDelPalletHeaderData headerData = new EcssCoDelPalletHeaderData();
                 headerData.setSite(inData.getSite());
diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
index 735b7ec2..86bda251 100644
--- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml
+++ b/src/main/resources/mapper/ecss/EcssCommonMapper.xml
@@ -23,4 +23,14 @@
 			</if>
 		</where>
 	</select>
+
+	<select id="searchEcssCoDelNotifyDetail"   resultType="java.util.Map">
+		select a.*,#{cmcInvoice} as cmcInvoice
+		from ecss_CoDelNotifydetail a
+		<where>
+			And a.site = #{site}
+			AND a.delNo = #{delNo}
+		</where>
+		order by a.item_no
+	</select>
 </mapper>