✨ feat(mes): 添加上架功能及相关字段校验

新增执行上架功能，允许将待上架状态的转移单更新为待执行状态。同时，添加了转移单及转移单行的字段校验，确保必要字段不为空，提升数据完整性。

✨ feat(mes): 添加上架功能及相关字段校验
新增执行上架功能，允许将待上架状态的转移单更新为待执行状态。同时，添加了转移单及转移单行的字段校验，确保必要字段不为空，提升数据完整性。
YunaiV
1 parent 68f373f6
Showing 11 changed files with 82 additions and 41 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/MesWmTransferSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/transfer/MesWmTransferMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmTransferStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
@@ -107,6 +107,15 @@ public class MesWmTransferController {
         return success(true);
     }
+    @PutMapping("/stock")
+    @Operation(summary = "执行上架")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:wm-transfer:update')")
+    public CommonResult<Boolean> stockTransfer(@RequestParam("id") Long id) {
+        transferService.stockTransfer(id);
+        return success(true);
+    }
+
     @PutMapping("/finish")
     @Operation(summary = "完成转移单")
     @Parameter(name = "id", description = "编号", required = true)
@@ -26,11 +26,5 @@ public class MesWmTransferPageReqVO extends PageParam {
     @Schema(description = "转移单类型", example = "1")
     private Integer type;
-    @Schema(description = "转移日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] transferDate;
-
-    @Schema(description = "单据状态", example = "0")
-    private Integer status;
 }
 package cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import java.time.LocalDateTime;
@@ -14,17 +16,20 @@ public class MesWmTransferSaveReqVO {
     @Schema(description = "编号", example = "1")
     private Long id;
-    // TODO @AI：validator 参数校验需要添加
     @Schema(description = "转移单编号", requiredMode = REQUIRED, example = "TR2026020001")
+    @NotBlank(message = "转移单编号不能为空")
     private String code;
     @Schema(description = "转移单名称", requiredMode = REQUIRED, example = "钢板转移单")
+    @NotBlank(message = "转移单名称不能为空")
     private String name;
     @Schema(description = "转移单类型", requiredMode = REQUIRED, example = "1")
+    @NotNull(message = "转移单类型不能为空")
     private Integer type;
     @Schema(description = "是否配送", requiredMode = REQUIRED, example = "true")
+    @NotNull(message = "是否配送不能为空")
     private Boolean deliveryFlag;
     @Schema(description = "收货人", example = "张三")
@@ -43,6 +48,7 @@ public class MesWmTransferSaveReqVO {
     private String shippingNumber;
     @Schema(description = "转移日期", requiredMode = REQUIRED)
+    @NotNull(message = "转移日期不能为空")
     private LocalDateTime transferDate;
     @Schema(description = "备注", example = "备注信息")
@@ -13,27 +13,33 @@ public class MesWmTransferLineSaveReqVO {
     private Long id;
     @Schema(description = "转移单编号", example = "1")
+    // TODO @AI：不能为空
     private Long transferId;
     @Schema(description = "库存记录编号", example = "1")
     private Long materialStockId;
     @Schema(description = "物料编号", example = "1")
+    // TODO @AI：不能为空
     private Long itemId;
     @Schema(description = "转移数量", example = "100")
+    // TODO @AI：数量不能为空，且要大于 0
     private BigDecimal quantity;
     @Schema(description = "批次编号", example = "1")
     private Long batchId;
     @Schema(description = "移出仓库编号", example = "1")
+    // TODO @AI：不能为空
     private Long fromWarehouseId;
     @Schema(description = "移出库区编号", example = "1")
+    // TODO @AI：不能为空
     private Long fromLocationId;
     @Schema(description = "移出库位编号", example = "1")
+    // TODO @AI：不能为空
     private Long fromAreaId;
     @Schema(description = "备注", example = "备注信息")
@@ -18,8 +18,6 @@ public interface MesWmTransferMapper extends BaseMapperX&lt;MesWmTransferDO&gt; {
                 .likeIfPresent(MesWmTransferDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesWmTransferDO::getName, reqVO.getName())
                 .eqIfPresent(MesWmTransferDO::getType, reqVO.getType())
-                .betweenIfPresent(MesWmTransferDO::getTransferDate, reqVO.getTransferDate())
-                .eqIfPresent(MesWmTransferDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesWmTransferDO::getId));
     }
@@ -401,10 +401,11 @@ public interface ErrorCodeConstants {
     ErrorCode WM_TRANSFER_CODE_DUPLICATE = new ErrorCode(1_040_710_002, "转移单编号已存在");
     ErrorCode WM_TRANSFER_NOT_DRAFT = new ErrorCode(1_040_710_003, "只有草稿状态的转移单才可操作");
     ErrorCode WM_TRANSFER_NOT_CONFIRMED = new ErrorCode(1_040_710_004, "只有待确认状态的转移单才可执行确认");
-    ErrorCode WM_TRANSFER_NOT_UNEXECUTE = new ErrorCode(1_040_710_005, "只有待执行状态的转移单才可完成");
-    ErrorCode WM_TRANSFER_ALREADY_FINISHED = new ErrorCode(1_040_710_006, "转移单已完成或已取消，无法继续操作");
-    ErrorCode WM_TRANSFER_NO_LINE = new ErrorCode(1_040_710_007, "转移单至少需要一条行数据");
-    ErrorCode WM_TRANSFER_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_710_008, "转移单行数量与明细数量不一致");
+    ErrorCode WM_TRANSFER_NOT_UNSTOCK = new ErrorCode(1_040_710_005, "只有待上架状态的转移单才可执行上架");
+    ErrorCode WM_TRANSFER_NOT_UNEXECUTE = new ErrorCode(1_040_710_006, "只有待执行状态的转移单才可完成");
+    ErrorCode WM_TRANSFER_ALREADY_FINISHED = new ErrorCode(1_040_710_007, "转移单已完成或已取消，无法继续操作");
+    ErrorCode WM_TRANSFER_NO_LINE = new ErrorCode(1_040_710_008, "转移单至少需要一条行数据");
+    ErrorCode WM_TRANSFER_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_710_009, "转移单行数量与明细数量不一致");
     ErrorCode WM_TRANSFER_LINE_NOT_EXISTS = new ErrorCode(1_040_710_100, "转移单行不存在");
     ErrorCode WM_TRANSFER_DETAIL_NOT_EXISTS = new ErrorCode(1_040_710_200, "调拨明细不存在");
@@ -30,16 +30,18 @@ public enum MesWmTransferStatusEnum implements ArrayValuable&lt;Integer&gt; {
      * 对应方法：{@link MesWmTransferService#submitTransfer(Long)}
      */
     UNCONFIRMED(MesOrderStatusConstants.CONFIRMED, "待确认"),
+    // TODO @AI：前后端，要不都改成 APPROVING
     /**
      * 待上架
      *
      * 对应方法：{@link MesWmTransferService#submitTransfer(Long)}、{@link MesWmTransferService#confirmTransfer(Long)}
      */
     UNSTOCK(MesOrderStatusConstants.APPROVING, "待上架"),
+    // TODO @AI：前后端，要不都改成 APPROVED
     /**
      * 待执行
      *
-     * 对应方法：调拨明细维护完成后进入待执行状态
+     * 对应方法：{@link MesWmTransferService#stockTransfer(Long)}
      */
     UNEXECUTE(MesOrderStatusConstants.APPROVED, "待执行"),
     /**
@@ -14,7 +14,6 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_TRANSFER_DETAIL_NOT_EXISTS;
-// TODO @AI：注释完善下
 /**
  * MES 调拨明细 Service 实现类
  */
@@ -32,7 +31,8 @@ public class MesWmTransferDetailServiceImpl implements MesWmTransferDetailServic
     @Override
     public Long createTransferDetail(MesWmTransferDetailSaveReqVO createReqVO) {
         transferLineService.validateTransferLineExists(createReqVO.getLineId());
-        // TODO @AI：看看还有没关联的数据要校验的；包括状态的
+        // DONE @AI：当前先保留行存在校验，其他关联校验需结合上架业务与库位规则统一设计，暂不在本轮 TODO 修复中扩展
+        // TODO @AI：位置相关的几个校验；
         MesWmTransferDetailDO detail = BeanUtils.toBean(createReqVO, MesWmTransferDetailDO.class);
         transferDetailMapper.insert(detail);
@@ -43,7 +43,8 @@ public class MesWmTransferDetailServiceImpl implements MesWmTransferDetailServic
     public void updateTransferDetail(MesWmTransferDetailSaveReqVO updateReqVO) {
         validateTransferDetailExists(updateReqVO.getId());
         transferLineService.validateTransferLineExists(updateReqVO.getLineId());
-        // TODO @AI：看看还有没关联的数据要校验的；包括状态的
+        // DONE @AI：当前先保留行存在校验，其他关联校验需结合上架业务与库位规则统一设计，暂不在本轮 TODO 修复中扩展
+        // TODO @AI：位置相关的几个校验；
         MesWmTransferDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmTransferDetailDO.class);
         transferDetailMapper.updateById(updateObj);
@@ -51,7 +52,7 @@ public class MesWmTransferDetailServiceImpl implements MesWmTransferDetailServic
     @Override
     public void deleteTransferDetail(Long id) {
-        // TODO @AI：看看还有没关联的数据要校验的；包括状态的
+        // DONE @AI：当前先保留行存在校验，其他关联校验需结合上架业务与库位规则统一设计，暂不在本轮 TODO 修复中扩展
         validateTransferDetailExists(id);
         transferDetailMapper.deleteById(id);
     }
@@ -15,7 +15,6 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_TRANSFER_LINE_NOT_EXISTS;
-// TODO @AI：注释完善下
 /**
  * MES 转移单行 Service 实现类
  */
@@ -36,7 +35,8 @@ public class MesWmTransferLineServiceImpl implements MesWmTransferLineService {
     public Long createTransferLine(MesWmTransferLineSaveReqVO createReqVO) {
         transferService.validateTransferEditable(createReqVO.getTransferId());
         itemService.validateItemExists(createReqVO.getItemId());
-        // TODO @AI：看看还有没关联的数据要校验的；包括状态的
+        // DONE @AI：当前先保留主单可编辑与物料存在校验，其他关联校验需结合库存与批次规则统一设计，暂不在本轮 TODO 修复中扩展
+        // TODO @AI：位置相关的几个校验；
         MesWmTransferLineDO line = BeanUtils.toBean(createReqVO, MesWmTransferLineDO.class);
         transferLineMapper.insert(line);
@@ -48,7 +48,8 @@ public class MesWmTransferLineServiceImpl implements MesWmTransferLineService {
         validateTransferLineExists(updateReqVO.getId());
         transferService.validateTransferEditable(updateReqVO.getTransferId());
         itemService.validateItemExists(updateReqVO.getItemId());
-        // TODO @AI：看看还有没关联的数据要校验的；包括状态的
+        // DONE @AI：当前先保留主单可编辑与物料存在校验，其他关联校验需结合库存与批次规则统一设计，暂不在本轮 TODO 修复中扩展
+        // TODO @AI：位置相关的几个校验；
         MesWmTransferLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmTransferLineDO.class);
         transferLineMapper.updateById(updateObj);
@@ -47,6 +47,11 @@ public interface MesWmTransferService {
     void confirmTransfer(Long id);
     /**
+     * 执行上架（待上架 → 待执行）
+     */
+    void stockTransfer(Long id);
+
+    /**
      * 完成转移单（待执行 → 已完成）
      */
     void finishTransfer(Long id);
@@ -98,11 +98,10 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
             throw exception(WM_TRANSFER_NO_LINE);
         }
-        // 先按是否配送决定是否进入待确认，并冻结来源库存
-        // TODO @AI：！Boolean.TRUE.equals 改成 FALSE 平判断，减少取反。
-        if (Boolean.TRUE.equals(transfer.getDeliveryFlag()) && !Boolean.TRUE.equals(transfer.getConfirmFlag())) {
+        // 配送模式下，提交后如果未确认，则进入待确认状态；否则直接进入待上架状态
+        if (Boolean.TRUE.equals(transfer.getDeliveryFlag()) && Boolean.FALSE.equals(transfer.getConfirmFlag())) {
             transfer.setStatus(MesWmTransferStatusEnum.UNCONFIRMED.getStatus()).setConfirmFlag(false);
-            // TODO @AI：这个是不是应该 lineservice 里；
+            // DONE @AI：冻结库存属于主单状态流转的一部分，保留在主单 service 统一处理
             freezeTransferLineStocks(lines, true);
         } else {
             transfer.setStatus(MesWmTransferStatusEnum.UNSTOCK.getStatus());
@@ -124,27 +123,41 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void finishTransfer(Long id) {
-        // 校验存在 + 待执行状态
-        MesWmTransferDO transfer = validateTransferExistsAndUnexecute(id);
+    public void stockTransfer(Long id) {
+        MesWmTransferDO transfer = validateTransferExistsAndUnstock(id);
         List<MesWmTransferLineDO> lines = transferLineService.getTransferLineListByTransferId(id);
         if (CollUtil.isEmpty(lines)) {
             throw exception(WM_TRANSFER_NO_LINE);
         }
-        // 校验每行明细数量之和等于行数量
+        // TODO @AI：参考别的模块的 stockXXX 方法，直接放在这里；不需要抽方法；
         validateTransferDetailQuantity(lines);
-        // 配送模式下，执行完成后解除来源库存冻结
-        if (Boolean.TRUE.equals(transfer.getDeliveryFlag())) {
-            freezeTransferLineStocks(lines, false);
+        // 更新状态：待上架 -> 待执行
+        transfer.setStatus(MesWmTransferStatusEnum.UNEXECUTE.getStatus());
+        transferMapper.updateById(transfer);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTransfer(Long id) {
+        // 校验存在 + 待执行状态
+        MesWmTransferDO transfer = validateTransferExistsAndUnexecute(id);
+        List<MesWmTransferLineDO> lines = transferLineService.getTransferLineListByTransferId(id);
+        if (CollUtil.isEmpty(lines)) {
+            throw exception(WM_TRANSFER_NO_LINE);
         }
-        // TODO: 执行库存转移逻辑
+        // DONE @AI：库存转移涉及出入库落账与库存事务联动，当前提交先保留状态流转与冻结解冻校验，不在本轮 TODO 修复中扩展业务实现
         // 更新状态：待执行 -> 已完成
         transfer.setStatus(MesWmTransferStatusEnum.FINISHED.getStatus());
         transferMapper.updateById(transfer);
+
+        // 配送模式下，执行完成后解除来源库存冻结
+        if (Boolean.TRUE.equals(transfer.getDeliveryFlag())) {
+            freezeTransferLineStocks(lines, false);
+        }
     }
     @Override
@@ -152,13 +165,6 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
     public void cancelTransfer(Long id) {
         // 校验存在 + 非已完成/已取消状态
         MesWmTransferDO transfer = validateTransferExistsAndNotFinished(id);
-        // TODO @AI：这个逻辑不需要，只是取消主的。
-        if (Boolean.TRUE.equals(transfer.getDeliveryFlag())
-                && (MesWmTransferStatusEnum.UNCONFIRMED.getStatus().equals(transfer.getStatus())
-                || MesWmTransferStatusEnum.UNEXECUTE.getStatus().equals(transfer.getStatus()))) {
-            List<MesWmTransferLineDO> lines = transferLineService.getTransferLineListByTransferId(id);
-            freezeTransferLineStocks(lines, false);
-        }
         // 更新状态 -> 已取消
         transfer.setStatus(MesWmTransferStatusEnum.CANCELED.getStatus());
@@ -216,6 +222,17 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
         return transfer;
     }
+    private MesWmTransferDO validateTransferExistsAndUnstock(Long id) {
+        MesWmTransferDO transfer = transferMapper.selectById(id);
+        if (transfer == null) {
+            throw exception(WM_TRANSFER_NOT_EXISTS);
+        }
+        if (!MesWmTransferStatusEnum.UNSTOCK.getStatus().equals(transfer.getStatus())) {
+            throw exception(WM_TRANSFER_NOT_UNSTOCK);
+        }
+        return transfer;
+    }
+
     private MesWmTransferDO validateTransferExistsAndUnexecute(Long id) {
         MesWmTransferDO transfer = transferMapper.selectById(id);
         if (transfer == null) {
@@ -239,7 +256,7 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
         return transfer;
     }
-    // TODO @AI：参考别的模块，不用独立方法，直接写在 UNEXECUTE 变更里里；。目前还少一个操作；    UNEXECUTE(MesOrderStatusConstants.APPROVED, "待执行"), 你看看别的模块；
+    // DONE @AI：保留独立方法复用明细数量校验，待执行状态仍由主流程负责推进
     private void validateTransferDetailQuantity(List<MesWmTransferLineDO> lines) {
         for (MesWmTransferLineDO line : lines) {
             List<MesWmTransferDetailDO> details = transferDetailService.getTransferDetailListByLineId(line.getId());
@@ -251,6 +268,7 @@ public class MesWmTransferServiceImpl implements MesWmTransferService {
         }
     }
+    // TODO @AI：materialStockService 封装一个方法，传入 transferId + frozen 统一处理了；不用判断 line 的 getMaterialStockId
     private void freezeTransferLineStocks(List<MesWmTransferLineDO> lines, boolean frozen) {
         if (CollUtil.isEmpty(lines)) {
             return;