From b50ca061d1bf2a576e36540d4b2c700dd5da02f3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 26 Feb 2026 19:08:52 +0800 Subject: [PATCH] ♻️ refactor(mes): 使用 MesOrderStatusConstants 替代状态枚举值 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java | 39 +++++++++++++++++++++++++++++++++------ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMaterialRequestStatusEnum.java | 12 +++++++----- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java index be080e5..56042ea 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmItemReceiptStatusEnum.java @@ -1,12 +1,14 @@ 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.itemreceipt.vo.MesWmItemReceiptSaveReqVO; +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; +import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService; import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Arrays; -// TODO @AI:应该使用 MesOrderStatusEnum 替代掉,只是使用其中的部分状态。需要在对应的 DO 说明下;当然,字典还是独立的! /** * MES 采购入库单状态枚举 * @@ -16,11 +18,36 @@ import java.util.Arrays; @AllArgsConstructor public enum MesWmItemReceiptStatusEnum implements ArrayValuable { - PREPARE(0, "草稿"), - APPROVING(1, "待上架"), - APPROVED(2, "待入库"), - FINISHED(3, "已完成"), - CANCELED(4, "已取消"); + /** + * 草稿 + * + * 对应方法:{@link MesWmItemReceiptService#createItemReceipt(MesWmItemReceiptSaveReqVO)} + */ + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), + /** + * 待上架 + * + * 对应方法:{@link MesWmItemReceiptService#submitItemReceipt(Long)} + */ + APPROVING(MesOrderStatusConstants.APPROVING, "待上架"), + /** + * 待入库 + * + * 对应方法:{@link MesWmItemReceiptService#stockItemReceipt(Long)} + */ + APPROVED(MesOrderStatusConstants.APPROVED, "待执行入库"), + /** + * 已完成 + * + * 对应方法:{@link MesWmItemReceiptService#executeItemReceipt(Long)} + */ + FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), + /** + * 已取消 + * + * 对应方法:{@link MesWmItemReceiptService#cancelItemReceipt(Long)} + */ + CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmItemReceiptStatusEnum::getStatus).toArray(Integer[]::new); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMaterialRequestStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMaterialRequestStatusEnum.java index f3b6d02..ab546dd 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMaterialRequestStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmMaterialRequestStatusEnum.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.mes.enums.wm; import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; import lombok.AllArgsConstructor; import lombok.Getter; import java.util.Arrays; +// TODO @AI:这里需要迁移下; /** * MES 领料申请单状态枚举 * @@ -15,11 +17,11 @@ import java.util.Arrays; @AllArgsConstructor public enum MesWmMaterialRequestStatusEnum implements ArrayValuable { - PREPARE(0, "草稿"), - PREPARING(1, "备料中"), - WAITING(2, "待领料"), - FINISHED(3, "已完成"), - CANCELED(4, "已取消"); + PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), + PREPARING(MesOrderStatusConstants.APPROVING, "备料中"), + WAITING(MesOrderStatusConstants.APPROVED, "待领料"), + FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), + CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmMaterialRequestStatusEnum::getStatus).toArray(Integer[]::new); -- libgit2 0.21.4