From c54ee29613075c6b9791b8b0a383648cb9d6afa7 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Thu, 26 Jun 2025 08:19:23 +0800
Subject: [PATCH] =?UTF-8?q?workSequence=E8=A7=84=E5=88=99=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=A4=A7=E5=80=BC?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=9D=E8=AF=81=E5=8D=87=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/listener/UploadDbsListener.java     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java b/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java
index 27f6341..b9318ff 100644
--- a/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java
+++ b/src/main/java/com/wms/utils/excel/listener/UploadDbsListener.java
@@ -31,10 +31,13 @@ public class UploadDbsListener implements ReadListener<KateDbsExcelVo> {
     private final String uploadUser;// 用户
     private final Map<String, KateDBS> oldKateDBSMap;// 旧的DBS数据
     private final Map<String, KateDBS> newKateDBSMap = new HashMap<>();// 新的DBS数据
+    private final int maxSequence;
     public UploadDbsListener(KateDBSService kateDBSService, Map<String, KateDBS> oldKateDBSMap, String uploadUser) {
         this.kateDBSService = kateDBSService;
         this.oldKateDBSMap = oldKateDBSMap;
         this.uploadUser = uploadUser;
+        // 获取最大序列号
+        maxSequence = oldKateDBSMap.values().stream().mapToInt(KateDBS::getWorkSequence).max().orElse(0);
     }
 
     @Override
@@ -93,18 +96,20 @@ public class UploadDbsListener implements ReadListener<KateDbsExcelVo> {
             if (oldKateDBSMap.containsKey(kateDbsExcelVo.getWorkOrder())) {
                 // 之前有
                 KateDBS oldKateDbs = oldKateDBSMap.get(kateDbsExcelVo.getWorkOrder());
-                oldKateDbs.setWorkSequence(kateDbsExcelVo.getWorkSequence());
-                oldKateDbs.setMachineNo(kateDbsExcelVo.getMachineNo());
-                oldKateDbs.setPlanStartDate(kateDbsExcelVo.getPlanStartDate());
-                oldKateDbs.setLastUpdateTime(LocalDateTime.now());
-                oldKateDbs.setLastUpdateUser(uploadUser);
-                // 替换
-                newKateDBSMap.put(kateDbsExcelVo.getWorkOrder(), oldKateDbs);
+                if (oldKateDbs.getDbsStatus() == 0) {
+                    oldKateDbs.setWorkSequence(maxSequence + kateDbsExcelVo.getWorkSequence());
+                    oldKateDbs.setMachineNo(kateDbsExcelVo.getMachineNo());
+                    oldKateDbs.setPlanStartDate(kateDbsExcelVo.getPlanStartDate());
+                    oldKateDbs.setLastUpdateTime(LocalDateTime.now());
+                    oldKateDbs.setLastUpdateUser(uploadUser);
+                    // 替换
+                    newKateDBSMap.put(kateDbsExcelVo.getWorkOrder(), oldKateDbs);
+                }
             } else {
                 // 之前没有
                 KateDBS newKateDbs = new KateDBS();
                 newKateDbs.setDbsId(generateId("DBS_"));
-                newKateDbs.setWorkSequence(kateDbsExcelVo.getWorkSequence());
+                newKateDbs.setWorkSequence(maxSequence + kateDbsExcelVo.getWorkSequence());
                 newKateDbs.setMachineNo(kateDbsExcelVo.getMachineNo());
                 newKateDbs.setWorkOrder(kateDbsExcelVo.getWorkOrder());
                 newKateDbs.setPlanStartDate(kateDbsExcelVo.getPlanStartDate());