From 9ac2bb261a7aa6ba095f92f5eefe7fa60f7cae2f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 26 Feb 2026 13:27:17 +0800 Subject: [PATCH] reviewed --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java | 9 --------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java | 31 ++++++++++++++++++++----------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java | 2 +- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java | 34 ++++++++++++++++++++++++++++++---- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java index 3ea245d..83de15e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.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 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java index 2152f56..de5a9ab 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/MesOrderStatusConstants.java @@ -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; } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java index d62c235..c16bc6d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/qc/MesQcStatusEnum.java @@ -18,7 +18,7 @@ import java.util.Arrays; @AllArgsConstructor public enum MesQcStatusEnum implements ArrayValuable { - DRAFT(MesOrderStatusConstants.DRAFT, "草稿"), + DRAFT(MesOrderStatusConstants.PREPARE, "草稿"), FINISHED(MesOrderStatusConstants.FINISHED, "已完成"); public static final Integer[] ARRAYS = Arrays.stream(values()) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java index 3e8e39b..6e68f08 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java @@ -1,9 +1,13 @@ 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 { - 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); -- libgit2 0.21.4