From d4b5f098828c63be8067578375a16d8d49e0fe2f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 27 Mar 2026 09:43:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(wms):=20=E8=A7=A3=E5=86=B3=E5=90=88?=
 =?UTF-8?q?=E5=8D=B7=E6=93=8D=E4=BD=9C=E4=B8=AD=E9=92=A2=E5=8D=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加钢卷ID去重验证逻辑
- 防止相同钢卷重复参与合卷操作
- 抛出明确的业务异常提示重复问题
---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 0cd56817..a03c5fcb 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -2691,6 +2691,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 }
             }
         }
+        // 执行第二步操作之前要判断一下参与合卷的钢卷是否有重复，相同的钢卷不能进行合卷操作
+        Set<Long> coilIdSet = new HashSet<>();
+        for (WmsMaterialCoilBo originalCoilBo : bo.getNewCoils()) {
+            if (originalCoilBo.getCoilId() == null) {
+                continue;
+            }
+            if (!coilIdSet.add(originalCoilBo.getCoilId())) {
+                throw new RuntimeException("参与合卷的钢卷中存在重复，相同的钢卷不能进行合卷操作");
+            }
+        }
 
         // 第二步：执行合卷操作
         Boolean batchResult = updateByBatch(bo);

From 2041cb3e5d84b9b65dba37e33c73b8b8e998e86f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 27 Mar 2026 09:55:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(wms):=20=E5=88=A0=E9=99=A4=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=97=B6=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=8A=B6=E6=80=81=E4=B8=BA=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在删除钢卷操作中添加二维码状态更新逻辑
- 遍历钢卷列表检查是否存在关联的二维码记录ID
- 将关联的二维码记录状态设置为0表示失效
- 通过generateRecordService更新二维码记录状态
- 确保删除钢卷后对应的二维码同步失效
---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index a03c5fcb..6575ea58 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -2104,6 +2104,18 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 }
             }
         }
+        // 删除钢卷的时候要把钢卷对应的二维码状态改成 0 表示二维码失效
+        if (coilList != null) {
+            for (WmsMaterialCoil coil : coilList) {
+                if (coil.getQrcodeRecordId() != null) {
+                    WmsGenerateRecordBo qrBo = new WmsGenerateRecordBo();
+                    qrBo.setRecordId(coil.getQrcodeRecordId());
+                    qrBo.setStatus(0); // 0=失效
+                    generateRecordService.updateByBo(qrBo);
+                }
+            }
+        }
+
 
         return baseMapper.deleteBatchIds(ids) > 0;
     }