✨ feat(mes): 修改库存冻结标识字段名称为 'frozen'

将库存相关的冻结标识字段从 'frozenFlag' 修改为 'frozen'，以提高代码一致性和可读性。涉及多个数据对象和请求/响应对象的更新。

✨ feat(mes): 修改库存冻结标识字段名称为 'frozen'
将库存相关的冻结标识字段从 'frozenFlag' 修改为 'frozen'，以提高代码一致性和可读性。涉及多个数据对象和请求/响应对象的更新。
YunaiV
1 parent 75c1a638
Showing 25 changed files with 144 additions and 21 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockFreezeReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/vo/MesWmMaterialStockRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/plan/vo/MesWmStockTakingPlanSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/vo/MesWmStockTakingTaskSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/materialstock/MesWmMaterialStockDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/plan/MesWmStockTakingPlanDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/stocktaking/task/MesWmStockTakingTaskDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseAreaMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseLocationMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaService.java
@@ -14,7 +14,7 @@ public class MesWmMaterialStockFreezeReqVO {
     @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @NotNull(message = "冻结状态不能为空")
-    private Boolean frozenFlag;
+    private Boolean frozen;
 }
@@ -84,7 +84,7 @@ public class MesWmMaterialStockRespVO {
     @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @ExcelProperty("是否冻结")
-    private Boolean frozenFlag;
+    private Boolean frozen;
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
@@ -42,7 +42,7 @@ public class MesWmStockTakingPlanRespVO {
     @Schema(description = "是否冻结库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @ExcelProperty("是否冻结库存")
-    private Boolean frozenFlag;
+    private Boolean frozen;
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @ExcelProperty("状态")
@@ -38,7 +38,7 @@ public class MesWmStockTakingPlanSaveReqVO {
     @Schema(description = "是否冻结库存", example = "false")
     @NotNull(message = "是否冻结库存不能为空")
-    private Boolean frozenFlag;
+    private Boolean frozen;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -56,7 +56,7 @@ public class MesWmStockTakingTaskRespVO {
     @Schema(description = "是否冻结库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @ExcelProperty("是否冻结库存")
-    private Boolean frozenFlag;
+    private Boolean frozen;
     @Schema(description = "开始时间")
     @ExcelProperty("开始时间")
@@ -49,7 +49,7 @@ public class MesWmStockTakingTaskSaveReqVO {
     @Schema(description = "是否冻结库存", example = "false")
     @NotNull(message = "是否冻结库存不能为空")
-    private Boolean frozenFlag;
+    private Boolean frozen;
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -104,6 +104,6 @@ public class MesWmMaterialStockDO extends BaseDO {
     /**
      * 是否冻结
      */
-    private Boolean frozenFlag;
+    private Boolean frozen;
 }
@@ -63,7 +63,7 @@ public class MesWmStockTakingPlanDO extends BaseDO {
     /**
      * 是否冻结库存
      */
-    private Boolean frozenFlag;
+    private Boolean frozen;
     /**
      * 状态
@@ -71,7 +71,7 @@ public class MesWmStockTakingTaskDO extends BaseDO {
     /**
      * 是否冻结库存
      */
-    private Boolean frozenFlag;
+    private Boolean frozen;
     /**
      * 开始时间
@@ -22,6 +22,11 @@ import java.math.BigDecimal;
 public class MesWmWarehouseAreaDO extends BaseDO {
     /**
+     * 虚拟线边库位编码（配合 {@link MesWmWarehouseDO#WIP_VIRTUAL_WAREHOUSE} 使用）
+     */
+    public static final String WIP_VIRTUAL_AREA = "WIP_VIRTUAL_AREA";
+
+    /**
      * 编号
      */
     @TableId
@@ -66,6 +71,7 @@ public class MesWmWarehouseAreaDO extends BaseDO {
      * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
      */
     private Integer status;
+
     /**
      * 是否冻结
      */
@@ -22,6 +22,15 @@ import java.math.BigDecimal;
 public class MesWmWarehouseDO extends BaseDO {
     /**
+     * 虚拟线边库编码
+     *
+     * 业务背景：在线边库模式下，物料从总仓库发放到车间，但未被工序消耗前，这部分物料属于在制品（WIP）。
+     * 为了在系统中实现“发料与实际消耗”的解耦，并在不增加物理库位管理复杂度的前提下防止生产报工被负库存阻塞，
+     * 系统默认提供一个虚拟的线边库统管这些在制品。
+     */
+    public static final String WIP_VIRTUAL_WAREHOUSE = "WIP_VIRTUAL_WAREHOUSE";
+
+    /**
      * 编号
      */
     @TableId
@@ -22,6 +22,11 @@ import java.math.BigDecimal;
 public class MesWmWarehouseLocationDO extends BaseDO {
     /**
+     * 虚拟线边库区编码（配合 {@link MesWmWarehouseDO#WIP_VIRTUAL_WAREHOUSE} 使用）
+     */
+    public static final String WIP_VIRTUAL_LOCATION = "WIP_VIRTUAL_LOCATION";
+
+    /**
      * 编号
      */
     @TableId
@@ -27,7 +27,7 @@ public interface MesWmMaterialStockMapper extends BaseMapperX&lt;MesWmMaterialStock
                 .inIfPresent(MesWmMaterialStockDO::getItemId, itemIds)
                 .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
                 .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
-                .eqIfPresent(MesWmMaterialStockDO::getFrozenFlag, reqVO.getFrozen())
+                .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen())
                 .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                 .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
     }
@@ -27,9 +27,8 @@ public interface MesWmWarehouseAreaMapper extends BaseMapperX&lt;MesWmWarehouseArea
                 .orderByDesc(MesWmWarehouseAreaDO::getId));
     }
-    default MesWmWarehouseAreaDO selectByCode(Long locationId, String code) {
+    default MesWmWarehouseAreaDO selectByCode(String code) {
         return selectOne(new LambdaQueryWrapperX<MesWmWarehouseAreaDO>()
-                .eq(MesWmWarehouseAreaDO::getLocationId, locationId)
                 .eq(MesWmWarehouseAreaDO::getCode, code));
     }
@@ -30,6 +30,11 @@ public interface MesWmWarehouseLocationMapper extends BaseMapperX&lt;MesWmWarehouse
                 .eq(MesWmWarehouseLocationDO::getCode, code));
     }
+    default MesWmWarehouseLocationDO selectByCode(String code) {
+        return selectOne(new LambdaQueryWrapperX<MesWmWarehouseLocationDO>()
+                .eq(MesWmWarehouseLocationDO::getCode, code));
+    }
+
     default MesWmWarehouseLocationDO selectByName(Long warehouseId, String name) {
         return selectOne(new LambdaQueryWrapperX<MesWmWarehouseLocationDO>()
                 .eq(MesWmWarehouseLocationDO::getWarehouseId, warehouseId)
@@ -95,7 +95,7 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService 
         // 更新冻结状态
         materialStockMapper.updateById(new MesWmMaterialStockDO()
-                .setId(updateReqVO.getId()).setFrozenFlag(updateReqVO.getFrozenFlag()));
+                .setId(updateReqVO.getId()).setFrozen(updateReqVO.getFrozen()));
     }
     @Override
@@ -144,7 +144,7 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService 
                 .batchId(batchId).vendorId(vendorId)
                 .quantity(BigDecimal.ZERO) // 初始数量为 0，由 updateMaterialStockQuantity 更新
                 .receiptTime(receiptTime != null ? receiptTime : LocalDateTime.now())
-                .frozenFlag(false)
+                .frozen(false)
                 .build();
         materialStockMapper.insert(newStock);
         return newStock;
@@ -129,7 +129,7 @@ public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskServ
         // 3. 根据冻结标识，对物资进行冻结
         // TODO @芋艿：后续跟进下！
-        if (Boolean.TRUE.equals(task.getFrozenFlag())) {
+        if (Boolean.TRUE.equals(task.getFrozen())) {
             for (MesWmStockTakingTaskLineDO line : lines) {
                 if (line.getMaterialStockId() != null) {
                     updateMaterialStockFrozen(line.getMaterialStockId(), true);
@@ -150,7 +150,7 @@ public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskServ
         // 3. 解冻库存
         // TODO @芋艿：后续跟进下！
-        if (Boolean.TRUE.equals(task.getFrozenFlag())) {
+        if (Boolean.TRUE.equals(task.getFrozen())) {
             List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id);
             unfreezeStockTakingTaskStocks(lines);
         }
@@ -166,7 +166,7 @@ public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskServ
         }
         task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
         stockTakingTaskMapper.updateById(task);
-        if (Boolean.TRUE.equals(task.getFrozenFlag())) {
+        if (Boolean.TRUE.equals(task.getFrozen())) {
             unfreezeStockTakingTaskStocks(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id));
         }
     }
@@ -211,7 +211,7 @@ public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskServ
     private void updateMaterialStockFrozen(Long materialStockId, boolean frozen) {
         MesWmMaterialStockFreezeReqVO reqVO = new MesWmMaterialStockFreezeReqVO();
         reqVO.setId(materialStockId);
-        reqVO.setFrozenFlag(frozen);
+        reqVO.setFrozen(frozen);
         materialStockService.updateMaterialStockFrozen(reqVO);
     }
@@ -166,7 +166,7 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService {
         }
         // 2. 检查库存记录冻结
-        if (Boolean.TRUE.equals(materialStock.getFrozenFlag())) {
+        if (Boolean.TRUE.equals(materialStock.getFrozen())) {
             throw exception(WM_TRANSACTION_STOCK_FROZEN,
                     warehouse.getName(), location.getName(), area.getName());
         }
@@ -316,7 +316,7 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
             }
             MesWmMaterialStockFreezeReqVO freezeReqVO = new MesWmMaterialStockFreezeReqVO();
             freezeReqVO.setId(line.getMaterialStockId());
-            freezeReqVO.setFrozenFlag(frozen);
+            freezeReqVO.setFrozen(frozen);
             materialStockService.updateMaterialStockFrozen(freezeReqVO);
         }
     }
@@ -100,4 +100,12 @@ public interface MesWmWarehouseAreaService {
      */
     void validateWarehouseAreaExists(Long warehouseId, Long locationId, Long areaId);
+    /**
+     * 按编码获得库位（如果是虚拟线边库位编码且不存在，会自动插入）
+     *
+     * @param code 编码
+     * @return 库位
+     */
+    MesWmWarehouseAreaDO getWarehouseAreaByCode(String code);
+
 }
 package cn.iocoder.yudao.module.mes.service.wm.warehouse;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaPageReqVO;
@@ -109,7 +111,7 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService 
     }
     private void validateWarehouseAreaCodeUnique(Long id, Long locationId, String code) {
-        MesWmWarehouseAreaDO area = areaMapper.selectByCode(locationId, code);
+        MesWmWarehouseAreaDO area = areaMapper.selectByCode(code);
         if (area == null) {
             return;
         }
@@ -180,4 +182,31 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService 
         }
     }
+    @Override
+    public MesWmWarehouseAreaDO getWarehouseAreaByCode(String code) {
+        // 1. 查询库位，存在则直接返回
+        MesWmWarehouseAreaDO area = areaMapper.selectByCode(code);
+        if (area != null) {
+            return area;
+        }
+
+        // 2. 如果是虚拟线边库位编码，则自动初始化
+        if (MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA.equals(code)) {
+            // 2.1 先确保虚拟库区存在（getWarehouseLocationByCode 会级联创建仓库 + 库区）
+            MesWmWarehouseLocationDO location = locationService.getWarehouseLocationByCode(
+                    MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
+            Assert.notNull(location, "虚拟库区必须存在");
+            // 2.2 自动初始化
+            MesWmWarehouseAreaDO newArea = MesWmWarehouseAreaDO.builder()
+                    .locationId(location.getId()).code(code).name("虚拟线边库位")
+                    .status(CommonStatusEnum.ENABLE.getStatus()).frozen(false)
+                    .allowItemMixing(true).allowBatchMixing(true)
+                    .remark("系统自动初始化的虚拟线边库位")
+                    .build();
+            areaMapper.insert(newArea);
+            return newArea;
+        }
+        return null;
+    }
+
 }
@@ -91,4 +91,12 @@ public interface MesWmWarehouseLocationService {
      */
     Long getWarehouseLocationCountByWarehouseId(Long warehouseId);
+    /**
+     * 按编码获得库区（如果是虚拟线边库区编码且不存在，会自动插入）
+     *
+     * @param code 编码
+     * @return 库区
+     */
+    MesWmWarehouseLocationDO getWarehouseLocationByCode(String code);
+
 }
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseLocationMapper;
 import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum;
 import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
@@ -160,4 +161,29 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation
         return locationMapper.selectCountByWarehouseId(warehouseId);
     }
+    @Override
+    public MesWmWarehouseLocationDO getWarehouseLocationByCode(String code) {
+        // 1. 查询库区，存在则直接返回
+        MesWmWarehouseLocationDO location = locationMapper.selectByCode(code);
+        if (location != null) {
+            return location;
+        }
+
+        // 2. 如果是虚拟线边库区编码，则自动初始化
+        if (MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION.equals(code)) {
+            // 2.1 先确保虚拟仓库存在（getWarehouseByCode 会级联创建仓库）
+            MesWmWarehouseDO warehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
+            cn.hutool.core.lang.Assert.notNull(warehouse, "虚拟仓库必须存在");
+            // 2.2 自动初始化
+            MesWmWarehouseLocationDO newLocation = MesWmWarehouseLocationDO.builder()
+                    .warehouseId(warehouse.getId()).code(code).name("虚拟线边库区")
+                    .areaStatus(cn.iocoder.yudao.framework.common.enums.CommonStatusEnum.ENABLE.getStatus())
+                    .frozen(false).remark("系统自动初始化的虚拟线边库区")
+                    .build();
+            locationMapper.insert(newLocation);
+            return newLocation;
+        }
+        return null;
+    }
+
 }
@@ -82,4 +82,12 @@ public interface MesWmWarehouseService {
         return convertMap(getWarehouseList(ids), MesWmWarehouseDO::getId);
     }
+    /**
+     * 按编码获得仓库（如果是虚拟线边库编码且不存在，会自动插入）
+     *
+     * @param code 编码
+     * @return 仓库
+     */
+    MesWmWarehouseDO getWarehouseByCode(String code);
+
 }
@@ -148,4 +148,24 @@ public class MesWmWarehouseServiceImpl implements MesWmWarehouseService {
         return warehouseMapper.selectListByIds(ids);
     }
+    @Override
+    public MesWmWarehouseDO getWarehouseByCode(String code) {
+        // 1. 查询仓库，存在则直接返回
+        MesWmWarehouseDO warehouse = warehouseMapper.selectByCode(code);
+        if (warehouse != null) {
+            return warehouse;
+        }
+
+        // 2. 如果是虚拟线边库编码，则自动初始化
+        if (MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE.equals(code)) {
+            MesWmWarehouseDO newWarehouse = MesWmWarehouseDO.builder()
+                    .code(code).name("虚拟线边仓库").frozen(false)
+                    .remark("系统自动初始化的虚拟线边仓库（用于生产报工与在制品管理解耦）")
+                    .build();
+            warehouseMapper.insert(newWarehouse);
+            return newWarehouse;
+        }
+        return null;
+    }
+
 }