From 38c7b13ce1f2a21fda14f100f9ee8d493b345f6b Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 14 Apr 2026 14:39:41 +0800
Subject: [PATCH] =?UTF-8?q?Excel=E9=87=8C=E7=9A=84salesOrder=E5=92=8C?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?salesOrder=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5Excel=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/ecss/data/EcssCoDelPalletData.java   | 6 ++++++
 .../modules/ecss/service/impl/CoDelExcelServiceImpl.java   | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletData.java b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletData.java
index 1b31f577..d53f1e03 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletData.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelPalletData.java
@@ -11,6 +11,10 @@ import java.math.BigDecimal;
 @Alias("EcssCoDelPalletData")
 public class EcssCoDelPalletData extends EcssCoDelPalletDetailData{
     private String palletNo;
+    /**
+     * Excel中的实际行号（从1开始）
+     */
+    private Integer excelRowNumber;
 
     /**
      *
@@ -56,4 +60,6 @@ public class EcssCoDelPalletData extends EcssCoDelPalletDetailData{
 
     private BigDecimal oldQty;
 
+    private String salesOrder;
+
 }
diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
index 2599714a..3f9c84df 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
@@ -1522,6 +1522,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
 
                 // 创建对象
                 EcssCoDelPalletData excelData = new EcssCoDelPalletData();
+                excelData.setExcelRowNumber(j + 1);
 
                 // 为对象赋值
                 excelData.setSite(inData.getSite());
@@ -1532,7 +1533,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 excelData.setPn(getStringCellValue(row, 0));
 
                 // 读取SO（列B，索引1）
-                //excelData.setPoNo(getStringCellValue(row, 1));
+                excelData.setSalesOrder(getStringCellValue(row, 1));
 
                 // 读取数量（列C，索引2）
                 excelData.setQty(getNumericCellValueOrDefault(row, 2, "数量"));
@@ -1622,6 +1623,10 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 if (notifyDetail != null) {
                     // 从发货通知单明细中获取PO
                     palletData.setPoNo(notifyDetail.getCustomerPO());
+                    // 判断Excel里的salesOrder和发货通知单上的salesOrder是否一致，如果不一致，抛出异常提示用户检查Excel数据
+                    if (!palletData.getSalesOrder().equals(notifyDetail.getSalesOrder())) {
+                        throw new RuntimeException("导入失败：第" + palletData.getExcelRowNumber() + "行，Excel中的SO（" + palletData.getSalesOrder() + "）与发货通知单明细中的SO（" + notifyDetail.getSalesOrder() + "）不一致，请检查Excel数据！");
+                    }
                 }
             }