From 28622a2b163ce1e1484741485f43a55ba04d4b51 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 16 Apr 2026 16:46:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E8=AE=A1=E5=88=92=E5=92=8C=E6=9D=90=E6=96=99=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=9C=8D=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在更新钢卷计划时设置创建时间和更新时间
- 添加登录用户信息到钢卷计划的创建者和更新者字段
- 初始化钢卷计划的状态和导出相关字段
- 移除占用仓库的冗余方法实现
- 在材料钢卷服务中同时更新数据类型和排他状态字段
---
 .../impl/WmsFurnacePlanServiceImpl.java       | 38 +++++--------------
 .../impl/WmsMaterialCoilServiceImpl.java      |  3 +-
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java
index ac98dfaa..a35f729d 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.common.core.domain.PageQuery;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.exception.ServiceException;
+import com.klp.common.helper.LoginHelper;
 import com.klp.common.utils.StringUtils;
 import com.klp.domain.*;
 import com.klp.domain.bo.WmsFurnacePlanBo;
@@ -346,6 +347,15 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
             updateBo.setCoilId(coil.getCoilId());
             updateBo.setWarehouseId(targetLocation);
             updateBo.setActualWarehouseId(-1L);
+            updateBo.setCreateTime(new Date());
+            updateBo.setUpdateTime(new Date());
+            updateBo.setExclusiveStatus(0);
+            updateBo.setCreateBy(LoginHelper.getUsername());
+            updateBo.setUpdateBy(LoginHelper.getUsername());
+            updateBo.setNextWarehouseId(null);
+            updateBo.setStatus(0);
+            updateBo.setExportBy(null);
+            updateBo.setExportTime(null);
 
             materialCoilService.updateByBo(updateBo, "annealing");
 
@@ -389,34 +399,6 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
             .set(WmsMaterialCoil::getExclusiveStatus, 2));
     }
 
-    private void occupyWarehouse(Long planId, Long coilId, Long warehouseId) {
-        if (warehouseId == null) {
-            throw new ServiceException("逻辑库位不能为空");
-        }
-        WmsWarehouse warehouse = warehouseMapper.selectById(warehouseId);
-        if (warehouse == null || warehouse.getDelFlag() != null && warehouse.getDelFlag() == 1) {
-            throw new ServiceException("逻辑库位不存在");
-        }
-
-        // wmsfurnace_plan_coil也要插入这个去向的逻辑库区
-        WmsFurnacePlanCoil wmsFurnacePlanCoil = planCoilMapper.selectOne(Wrappers.<WmsFurnacePlanCoil>lambdaQuery()
-            .eq(WmsFurnacePlanCoil::getPlanId, planId)
-            .eq(WmsFurnacePlanCoil::getCoilId, coilId)
-            //逻辑删除
-            .eq(WmsFurnacePlanCoil::getDelFlag, 0));
-
-        if (wmsFurnacePlanCoil != null && wmsFurnacePlanCoil.getPlanCoilId() != null) {
-            planCoilMapper.update(null, Wrappers.<WmsFurnacePlanCoil>lambdaUpdate()
-                .eq(WmsFurnacePlanCoil::getPlanCoilId, wmsFurnacePlanCoil.getPlanCoilId())
-                .set(WmsFurnacePlanCoil::getLogicWarehouseId, warehouseId));
-        }
-
-        WmsMaterialCoil updateCoil = new WmsMaterialCoil();
-        updateCoil.setCoilId(coilId);
-        updateCoil.setWarehouseId(warehouseId);
-        updateCoil.setExclusiveStatus(0);
-        materialCoilMapper.updateById(updateCoil);
-    }
 
     private List<Long> parseCoilIds(WmsFurnacePlanCoilBo bo) {
         List<Long> coilIds = new ArrayList<>();
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 e663d4ef..55c2b28a 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
@@ -1354,7 +1354,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         // 1. 将原钢卷标记为历史数据（dataType = 0）
         LambdaUpdateWrapper<WmsMaterialCoil> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(WmsMaterialCoil::getCoilId, oldCoil.getCoilId())
-            .set(WmsMaterialCoil::getDataType, 0); // 设置为历史数据
+            .set(WmsMaterialCoil::getDataType, 0) // 设置为历史数据
+            .set(WmsMaterialCoil::getExclusiveStatus, 0);
         baseMapper.update(null, updateWrapper);
 
         // 2. 创建新记录