From a3d7fb831307d1e867aaa1565d7429b4069fa00a Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 20 Jan 2026 10:07:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E9=92=A2=E5=8D=B7=E6=81=A2=E5=A4=8D=E6=97=B6=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了历史钢卷恢复功能中缺少当前钢卷ID参数导致的重复检查问题
- 确保在恢复历史钢卷时能够正确传递当前钢卷ID进行重复验证
- 防止因参数缺失导致的钢卷号重复检查逻辑错误
---
 .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bbf00a37..93daf32c 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
@@ -2827,7 +2827,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             }
 
             // 8. 检查历史钢卷的钢卷号是否重复
-            Map<String, Object> duplicateCheck = checkCoilNoDuplicate(null, historyCoil.getEnterCoilNo(), historyCoil.getCurrentCoilNo());
+            Map<String, Object> duplicateCheck = checkCoilNoDuplicate(currentCoilId, historyCoil.getEnterCoilNo(), historyCoil.getCurrentCoilNo());
             String duplicateType = (String) duplicateCheck.get("duplicateType");
             if (!"none".equals(duplicateType)) {
                 String errorMsg = "无法恢复历史钢卷，存在重复的钢卷号：";