From e5147564ce9e5c8515ccf785e1740c1bf442fa3e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 7 Mar 2026 10:29:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=8E=86=E5=8F=B2=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8D=A0=E7=94=A8=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E5=BA=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现历史钢卷(dataType=0)禁止修改实际库区的业务规则
- 当原钢卷为历史钢卷时阻止实际库区ID的更新操作
- 添加置空(-1)判断避免误操作历史钢卷库区占用
- 抛出运行时异常提示历史钢卷不允许占用实际库区
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 7 +++++++
 1 file changed, 7 insertions(+)

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 cdaeff41..d5e847ba 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
@@ -1108,6 +1108,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             validateActualWarehouseForAssign(bo.getActualWarehouseId(), ignoreOccupiedId);
         }
 
+        // 1. 历史钢卷（dataType=0）禁止修改实际库区（actualWarehouseId非空且不等于-1）
+        if (0 == oldCoil.getDataType()) { // 原钢卷是历史钢卷
+            // 场景1：传入了新的实际库区ID，且不是置空（-1），禁止操作
+            if (bo.getActualWarehouseId() != null && !bo.getActualWarehouseId().equals(-1L)) {
+                throw new RuntimeException("历史钢卷不允许占用实际库区!");
+            }
+        }
         // 直接更新钢卷属性
         WmsMaterialCoil updateCoil = BeanUtil.toBean(bo, WmsMaterialCoil.class);
         validEntityBeforeSave(updateCoil);