From c34fc1e477df33dec24120fd9253b48974c53f72 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 3 Jun 2026 15:06:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms/coil):=20=E4=BF=AE=E6=AD=A3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E7=B1=BB=E5=9E=8B505?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在钢卷操作校验逻辑中，原代码仅排除了操作类型501（入库）对子卷操作类型的校验。调整后，增加对操作类型505（出库）的排除，确保在入库和出库操作中，子卷的操作类型字段不会因非空而被错误校验，避免因校验不匹配导致的业务异常。
---
 .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 012aeefe..90b56d80 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
@@ -5000,7 +5000,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (childCoilBo.getActualWarehouseId() != null) {
             validateActualWarehouseForAssign(childCoilBo.getActualWarehouseId(), null);
         }
-        if (pendingAction.getActionType() != 501 && childCoilBo.getActionType() != null) {
+        if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505 && childCoilBo.getActionType() != null) {
             // 校验子卷净重不超过母卷
             if (childCoilBo.getNetWeight() != null && parentCoil.getNetWeight() != null) {
                 if (childCoilBo.getNetWeight().compareTo(parentCoil.getNetWeight()) > 0) {
@@ -5136,7 +5136,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 .map(WmsMaterialCoil::getCurrentCoilNo)
                 .collect(Collectors.toList());
 
-            if (pendingAction.getActionType() != 501) {
+            if (pendingAction.getActionType() != 501 && pendingAction.getActionType() != 505) {
                 // 校验所有子卷总重不超过母卷净重
                 if (parentCoil.getNetWeight() != null) {
                     BigDecimal totalChildWeight = childCoils.stream()