From ebb631e3ccad3c141718a79bdcbd772c3bc4ab6b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 20 Jan 2026 11:20:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(WmsMaterialCoilService):=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E5=90=88=E5=8D=B7=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除冗余的parent_coil_ids检查代码
- 直接返回MERGE_PRODUCT状态值
- 优化合卷操作的判断流程
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java  | 8 +-------
 1 file changed, 1 insertion(+), 7 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 f6564a0a..359305e9 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
@@ -3053,13 +3053,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 
                 // 2. 检查合卷操作（最新操作优先）
                 if ("合卷".equals(operation)) {
-                    Object parentCoilIdsObj = step.get("parent_coil_ids");
-                    if (parentCoilIdsObj != null) {
-                        String parentCoilIdsStr = parentCoilIdsObj.toString();
-                        if (parentCoilIdsStr.contains(currentCoilIdStr)) {
-                            return "MERGE_PRODUCT";
-                        }
-                    }
+                    return "MERGE_PRODUCT";
                 }
 
                 // 3. 检查分卷操作