reviewed

YunaiV
1 parent ba64b2f6
Showing 4 changed files with 51 additions and 25 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java
@@ -57,15 +57,6 @@ public class MesWmItemReceiptController {
     private MesMdVendorService vendorService;
     @Resource
-    private MesWmWarehouseService warehouseService;
-
-    @Resource
-    private MesWmWarehouseLocationService locationService;
-
-    @Resource
-    private MesWmWarehouseAreaService areaService;
-
-    @Resource
     private MesQcIqcService iqcService;
     @Resource
@@ -10,22 +10,31 @@ package cn.iocoder.yudao.module.mes.enums;
  */
 public final class MesOrderStatusConstants {
-    /** 草稿 */
-    public static final int DRAFT = 0;
-
-    /** 已确认 */
+    /**
+     * 草稿
+     */
+    public static final int PREPARE = 0;
+
+    /**
+     * 已确认
+     */
     public static final int CONFIRMED = 1;
-
-    /** 审批中 */
+    /**
+     * 审批中
+     */
     public static final int APPROVING = 2;
-
-    /** 已审批 */
+    /**
+     * 已审批
+     */
     public static final int APPROVED = 3;
-    /** 已完成 */
+    /**
+     * 已完成
+     */
     public static final int FINISHED = 4;
-
-    /** 已取消 */
+    /**
+     * 已取消
+     */
     public static final int CANCELLED = 5;
 }
@@ -18,7 +18,7 @@ import java.util.Arrays;
 @AllArgsConstructor
 public enum MesQcStatusEnum implements ArrayValuable<Integer> {
-    DRAFT(MesOrderStatusConstants.DRAFT, "草稿"),
+    DRAFT(MesOrderStatusConstants.PREPARE, "草稿"),
     FINISHED(MesOrderStatusConstants.FINISHED, "已完成");
     public static final Integer[] ARRAYS = Arrays.stream(values())
 package cn.iocoder.yudao.module.mes.enums.wm;
 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
+import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
+import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import java.math.BigDecimal;
 import java.util.Arrays;
 /**
@@ -15,10 +19,32 @@ import java.util.Arrays;
 @AllArgsConstructor
 public enum MesWmArrivalNoticeStatusEnum implements ArrayValuable<Integer> {
-    PREPARE(0, "草稿"),
-    PENDING_QC(1, "待质检"), // 对接 qc 模块的 MesQcIqcDO 前置流程
-    PENDING_RECEIPT(2, "待入库"), // 对接 wm 模块的 MesWmItemReceiptDO 后续流程
-    FINISHED(3, "已完成");
+    /**
+     * 草稿
+     *
+     * 对应方法：{@link MesWmArrivalNoticeService#createArrivalNotice(MesWmArrivalNoticeSaveReqVO)}
+     */
+    PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
+    /**
+     * 待质检（需要检验时），对接 qc 模块的 MesQcIqcDO 后续流程
+     *
+     * 对应方法：{@link MesWmArrivalNoticeService#submitArrivalNotice(Long)}
+     */
+    PENDING_QC(MesOrderStatusConstants.APPROVING, "待质检"),
+    /**
+     * 待入库（不需要检验时，或检验完成时），对接 wm 模块的 MesWmItemReceiptDO 后续流程
+     *
+     * 对应方法：
+     * 1. 不需要检验时：{@link MesWmArrivalNoticeService#submitArrivalNotice(Long)}
+     * 2. 或检验完成时：{@link MesWmArrivalNoticeService#approveArrivalNoticeWhenIqcComplete(Long, Long, Long, BigDecimal)}
+     */
+    PENDING_RECEIPT(MesOrderStatusConstants.APPROVED, "待入库"),
+    /**
+     * 已完成
+     *
+     * 对应方法：{@link MesWmArrivalNoticeService#finishArrivalNotice(Long)}
+     */
+    FINISHED(MesOrderStatusConstants.FINISHED, "已完成");
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmArrivalNoticeStatusEnum::getStatus).toArray(Integer[]::new);