From c1e3fa51413568fea3abf19a3d3b409bfdd4fdf5 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 11 Jun 2026 16:49:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E8=AD=A6=E5=91=8A=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉新增钢卷时的长度/厚度偏差检查
- 添加actionId为空判断条件避免警告插入异常
- 优化更新钢卷时的警告检查逻辑
---
 .../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 6a4f9b6b..609cc1df 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
@@ -1529,8 +1529,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             throw new RuntimeException("新增钢卷失败");
         }
 
-        // 检查长度/厚度偏差并插入告警
-        materialWarningService.checkAndInsertWarnings(add, bo);
+//        // 检查长度/厚度偏差并插入告警
+//        materialWarningService.checkAndInsertWarnings(add, bo);
 
         // 设置返回用的ID并更新二维码内容中的coilId
         bo.setCoilId(add.getCoilId());
@@ -1751,7 +1751,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 //        }
 
         // 检查长度/厚度偏差并插入告警
-        materialWarningService.checkAndInsertWarnings(updateCoil, bo);
+        if (bo.getActionId() != null) {
+            materialWarningService.checkAndInsertWarnings(updateCoil, bo);
+        }
 
         // 如果实际库区id为-1或状态为1，则清空钢卷上的实际库区绑定
         if ((bo.getActualWarehouseId() != null && bo.getActualWarehouseId().equals(-1L))