From c0f7c699a872023f718c1059cfbc2c359290a563 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 16 Apr 2026 16:30:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=9B=B4=E6=96=B0=E6=97=B6=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E7=B1=BB=E5=9E=8B=E6=A3=80=E6=9F=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在非退火步骤类型时才进行独占状态检查
- 添加对qrcodeStepType为空的边界情况处理
- 修复二维码内容更新中的空指针检查逻辑
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 6e111e96..bd9df568 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
@@ -1325,8 +1325,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
      * @return 新钢卷ID字符串
      */
     private String updateBySingle(WmsMaterialCoilBo bo, String qrcodeStepType) {
-        // 检查独占状态
-        validateCoilOperationPermission(bo.getCoilId(), "单个更新");
+        if (StringUtils.isNotBlank(qrcodeStepType) && !"annealing".equals(qrcodeStepType)){
+            // 检查独占状态
+            validateCoilOperationPermission(bo.getCoilId(), "单个更新");
+        }
 
         // 查询原钢卷
         WmsMaterialCoil oldCoil = baseMapper.selectById(bo.getCoilId());
@@ -1388,7 +1390,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 
         // 3. 更新二维码内容（添加更新步骤并更新current_coil_id）
         if (oldCoil.getQrcodeRecordId() != null) {
-            if ("annealing".equals(qrcodeStepType)) {
+            if (StringUtils.isNotBlank(qrcodeStepType) && "annealing".equals(qrcodeStepType)) {
                 updateQrcodeContentForCustomStep(oldCoil, bo, newCoil.getCoilId(), "退火", "退火操作");
             } else {
                 updateQrcodeContentForNormalUpdate(oldCoil, bo, newCoil.getCoilId());