From 91ddc8602a8f02cd5a27fcd5aa7d00a4f2250464 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 15 Jun 2026 11:35:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BC=98=E5=8C=96=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E9=94=81=E5=AE=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加getLockStatusDesc方法用于获取详细的锁定状态描述
- 实现针对不同锁定状态的状态码映射和中文描述
- 更新异常消息显示具体的锁定操作类型而非笼统提示
- 提升用户对钢卷当前操作状态的认知准确性
---
 .../impl/WmsMaterialCoilServiceImpl.java      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 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 5aabed7d..14f5d8e0 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
@@ -1987,6 +1987,23 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         return coil == null ? null : coil.getExclusiveStatus();
     }
 
+    /**
+     * 获取锁状态描述
+     */
+    private String getLockStatusDesc(Integer exclusiveStatus) {
+        if (exclusiveStatus == null) {
+            return "状态未知";
+        }
+        switch (exclusiveStatus) {
+            case 1: return "正在单步分卷中";
+            case 2: return "正在退火中";
+            case 3: return "已被酸扎领料锁定";
+            case 4: return "已被分卷领料锁定";
+            case 5: return "已被合卷领料锁定";
+            default: return "已被其他操作锁定（状态码：" + exclusiveStatus + "）";
+        }
+    }
+
     /**
      * 验证钢卷操作权限（检查独占状态）
      * @param coilId 钢卷ID
@@ -5031,7 +5048,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 
         // 3. 检查是否已被锁定或已有相同类型的待处理操作
         if (coil.getExclusiveStatus() != null && coil.getExclusiveStatus() != 0) {
-            throw new RuntimeException("钢卷正在进行操作");
+            String lockDesc = getLockStatusDesc(coil.getExclusiveStatus());
+            throw new RuntimeException("钢卷" + lockDesc + "，无法执行单步分卷");
         }
 
 //        // 3.1 检查是否已经有相同类型的待处理操作（防止重复领料）