From dc4d4ad3026b7921131db9dd16601f6fa0ee1a3b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 20 Jan 2026 13:05:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=9B=9E=E6=BB=9A=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=90=88=E5=8D=B7=E5=88=86=E5=8D=B7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除冗余的parent_coil_ids检查逻辑
- 简化合卷操作的回滚判断条件
- 统一合卷分卷操作的处理流程
- 添加代码注释说明分卷合卷操作的处理逻辑
---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 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 3bab6e37..4ac0b8d0 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
@@ -2959,18 +2959,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                     }
                 }
 
+                // 无论是分卷还是合卷 当前逻辑应该是可以继续的 此处先进行跳过 只回滚当前工序的
                 // 对于合卷操作，检查parent_coil_ids
                 if ("合卷".equals(step.get("operation"))) {
-                    Object parentCoilIdsObj = step.get("parent_coil_ids");
-                    if (parentCoilIdsObj != null) {
-                        String parentCoilIdsStr = parentCoilIdsObj.toString();
-                        if (parentCoilIdsStr.contains(currentCoilIdStr)) {
-                            // 当前钢卷是合卷的产物，返回null表示无法继续回滚
-                            return null;
-                        }
-                    }
+                    // 当前钢卷是合卷的产物，返回null表示无法继续回滚
+                    return null;
                 }
 
+
                 // 对于分卷操作，检查new_current_coil_nos是否包含多个钢卷号
                 if ("分卷".equals(step.get("operation"))) {
                     // 当前钢卷是分卷操作产生的子钢卷，无法回滚