From cb8fce435c71fb9e25862d363ff3634278297c0f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 15 Jun 2026 17:49:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E5=8D=B7=E5=8F=96=E6=B6=88=E6=93=8D=E4=BD=9C=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除过早删除待操作记录的代码
- 保留母卷独占锁释放功能但暂时注释
- 重新调整代码执行顺序确保业务逻辑正确性
- 修复可能导致数据不一致的操作步骤
---
 .../impl/WmsMaterialCoilServiceImpl.java      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 6d24cb8c..88df32f6 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
@@ -5371,8 +5371,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (StringUtils.isNotBlank(pendingAction.getRemark())) {
             throw new RuntimeException("该分卷操作已开始，请勿取消");
         }
-        // 删除待操作记录
-        coilPendingActionService.deleteWithValidByIds(Arrays.asList(pendingActionId), false);
         // 3. 查询母卷
         WmsMaterialCoil parentCoil = baseMapper.selectById(pendingAction.getCoilId());
         if (parentCoil == null) {
@@ -5387,14 +5385,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (Objects.equals(parentCoil.getExclusiveStatus(), 0)) {
             throw new RuntimeException("钢卷未处于分卷状态，无法取消");
         }
-
-        // 释放母卷独占锁
-        if (Objects.equals(parentCoil.getExclusiveStatus(), 1)) {
-            LambdaUpdateWrapper<WmsMaterialCoil> parentUpdate = new LambdaUpdateWrapper<>();
-            parentUpdate.eq(WmsMaterialCoil::getCoilId, parentCoil.getCoilId())
-                .set(WmsMaterialCoil::getExclusiveStatus, 0);
-            baseMapper.update(null, parentUpdate);
-        }
+        // 删除待操作记录
+        coilPendingActionService.deleteWithValidByIds(Arrays.asList(pendingActionId), false);
+//        // 释放母卷独占锁
+//        if (Objects.equals(parentCoil.getExclusiveStatus(), 1)) {
+//            LambdaUpdateWrapper<WmsMaterialCoil> parentUpdate = new LambdaUpdateWrapper<>();
+//            parentUpdate.eq(WmsMaterialCoil::getCoilId, parentCoil.getCoilId())
+//                .set(WmsMaterialCoil::getExclusiveStatus, 0);
+//            baseMapper.update(null, parentUpdate);
+//        }
 
         result.put("success", true);
         result.put("message", "取消分卷成功");