From f3496bcb9572cb9595b2a2f11e6559c31a3533ea Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 5 Feb 2026 11:44:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BA=93=E4=BD=8D=E7=8A=B6=E6=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 设置子钢卷的父钢卷ID以维护正确的父子关系
- 修正母卷库位ID传递逻辑避免错误的状态更新
- 添加母卷转历史卷时的库位释放处理确保库位状态正确
- 防止已加工完成的母卷占用库位资源
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java   | 7 ++++++-
 1 file changed, 6 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 3ea9e5e2..ea33616e 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
@@ -3447,9 +3447,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 
         // 7. 校验并插入子钢卷
         validEntityBeforeSave(childCoil);
+        childCoil.setParentCoilId(String.valueOf(parentCoilId));
         baseMapper.insert(childCoil);
 
-        updateActualWarehouseEnableStatus(parentCoil.getActualWarehouseId(), childCoilBo.getActualWarehouseId());
+        updateActualWarehouseEnableStatus(null, childCoilBo.getActualWarehouseId());
 
         // 8. 更新二维码中的coilId
         updateQrcodeCoilId(childQrcodeId, childCoil.getCoilId());
@@ -3520,6 +3521,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 .map(WmsMaterialCoil::getCurrentCoilNo)
                 .collect(Collectors.toList());
 
+            // 如果母卷即将成为历史卷 证明已经加工完成则释放库位
+            if (parentCoil.getActualWarehouseId() != null){
+                updateActualWarehouseEnableStatus(parentCoil.getActualWarehouseId(), null);
+            }
             // 4. 将母卷标记为历史数据
             LambdaUpdateWrapper<WmsMaterialCoil> parentUpdateWrapper = new LambdaUpdateWrapper<>();
             parentUpdateWrapper.eq(WmsMaterialCoil::getCoilId, parentCoilId)