✨ feat(mes): 增强领料出库单功能，新增客户信息和行数据校验

YunaiV
1 parent 8591cb9e
Showing 7 changed files with 37 additions and 7 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/MesWmProductIssueRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/detail/MesWmProductIssueDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productissue/MesWmProductIssueDetailMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/productissue/MesWmProductIssueMapper.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/service/wm/productissue/MesWmProductIssueService.java
@@ -11,9 +11,11 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
+import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
 import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
@@ -48,6 +50,8 @@ public class MesWmProductIssueController {
     private MesMdWorkstationService workstationService;
     @Resource
     private MesProWorkOrderService workOrderService;
+    @Resource
+    private MesMdClientService clientService;
     @PostMapping("/create")
     @Operation(summary = "创建领料出库单")
@@ -161,14 +165,17 @@ public class MesWmProductIssueController {
                 convertSet(list, MesWmProductIssueDO::getWorkstationId));
         Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
                 convertSet(list, MesWmProductIssueDO::getWorkOrderId));
+        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+                convertSet(workOrderMap.values(), MesProWorkOrderDO::getClientId));
         // 2. 构建结果
         return BeanUtils.toBean(list, MesWmProductIssueRespVO.class, vo -> {
-            // 2.1 填充工作站名称
             MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
                     workstation -> vo.setWorkstationName(workstation.getName()));
-            // 2.2 填充工单编号
-            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
-                    workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
+            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> {
+                vo.setWorkOrderCode(workOrder.getCode());
+                MapUtils.findAndThen(clientMap, workOrder.getClientId(), client ->
+                        vo.setClientCode(client.getCode()).setClientName(client.getName()));
+            });
         });
     }
@@ -30,12 +30,15 @@ public class MesWmProductIssueRespVO {
     @Schema(description = "工作站名称", example = "装配工作站")
     private String workstationName;
+    @Schema(description = "客户编号", example = "C001")
+    private String clientCode;
+
+    @Schema(description = "客户名称", example = "某某客户")
+    private String clientName;
+
     @Schema(description = "生产任务 ID", example = "1")
     private Long taskId;
-    @Schema(description = "客户 ID", example = "1")
-    private Long clientId;
-
     @Schema(description = "领料日期")
     private LocalDateTime issueDate;
 package cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.detail;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -27,6 +28,7 @@ public class MesWmProductIssueDetailSaveReqVO {
     @Schema(description = "领料数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
     @NotNull(message = "领料数量不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "领料数量必须大于 0")
     private BigDecimal quantity;
     @Schema(description = "批次编号", example = "1")
@@ -24,4 +24,8 @@ public interface MesWmProductIssueDetailMapper extends BaseMapperX&lt;MesWmProductI
         delete(MesWmProductIssueDetailDO::getIssueId, issueId);
     }
+    default void deleteByLineId(Long lineId) {
+        delete(MesWmProductIssueDetailDO::getLineId, lineId);
+    }
+
 }
@@ -24,4 +24,8 @@ public interface MesWmProductIssueMapper extends BaseMapperX&lt;MesWmProductIssueDO
                 .orderByDesc(MesWmProductIssueDO::getId));
     }
+    default MesWmProductIssueDO selectByCode(String code) {
+        return selectOne(MesWmProductIssueDO::getCode, code);
+    }
+
 }
@@ -426,7 +426,9 @@ public interface ErrorCodeConstants {
     ErrorCode WM_PRODUCT_ISSUE_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_708_006, "生产领料出库单已完成或已取消，无法取消");
     ErrorCode WM_PRODUCT_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_708_100, "生产领料出库单行不存在");
     ErrorCode WM_PRODUCT_ISSUE_LINE_ITEM_NOT_IN_BOM = new ErrorCode(1_040_708_101, "当前物料不在生产工单的 BOM 物料清单中");
+    ErrorCode WM_PRODUCT_ISSUE_CODE_DUPLICATE = new ErrorCode(1_040_708_102, "领料出库单编码已存在");
     ErrorCode WM_PRODUCT_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_708_200, "生产领料出库单明细不存在");
+    ErrorCode WM_PRODUCT_ISSUE_DETAIL_ITEM_MISMATCH = new ErrorCode(1_040_708_201, "拣货明细的物料与领料单行的物料不一致");
     // ========== MES 仓库管理-生产入库单（1-040-709-000） ==========
     ErrorCode WM_PRODUCT_PRODUCE_NOT_EXISTS = new ErrorCode(1_040_709_000, "生产入库单不存在");
@@ -58,6 +58,14 @@ public interface MesWmProductIssueService {
     MesWmProductIssueDO validateProductIssueExists(Long id);
     /**
+     * 校验领料出库单存在且为准备中状态
+     *
+     * @param id 编号
+     * @return 领料出库单
+     */
+    MesWmProductIssueDO validateProductIssueExistsAndPrepare(Long id);
+
+    /**
      * 提交领料出库单（草稿 → 待拣货）
      *
      * @param id 编号