From 1ea8dd17984f3fe89513c3a8492fba8ae91e8e04 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 2 Mar 2026 18:21:55 +0800 Subject: [PATCH] ✨ feat(mes): 更新销售出库单状态枚举及相关逻辑 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java | 22 ++++++++++++++++++++-- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java | 2 ++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java index 0649864..313f99f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java @@ -1,7 +1,9 @@ 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.productsales.vo.MesWmProductSalesSaveReqVO; import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants; +import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService; import lombok.AllArgsConstructor; import lombok.Getter; @@ -10,30 +12,46 @@ import java.util.Arrays; /** * MES 销售出库单状态枚举 * + * 对应字典 mes_wm_product_sales_status + * * @author 芋道源码 */ @Getter @AllArgsConstructor public enum MesWmProductSalesStatusEnum implements ArrayValuable { + // (草稿)提交 =》(待拣货)执行拣货 =》(待填写运单)填写运单;=》(待执行出库)执行出库=》(已完成) + /** * 草稿 + * + * 对应方法:{@link MesWmProductSalesService#createProductSales(MesWmProductSalesSaveReqVO)} */ PREPARE(MesOrderStatusConstants.PREPARE, "草稿"), /** * 待拣货 + * + * 对应方法:{@link MesWmProductSalesService#submitProductSales(Long)} */ APPROVING(MesOrderStatusConstants.APPROVING, "待拣货"), + // TODO @AI:在 APPROVING、APPROVED 之间加一个 10,SHIPPING,待填写运单;执行填写运单方法:{@link MesWmProductSalesService#shippingProductSales(Long)} + // TODO @AI:pick 这个方法要改成 stock; /** - * 待出库 + * 待执行出库 + * + * 对应方法:{@link MesWmProductSalesService#pickProductSales(Long)} */ - APPROVED(MesOrderStatusConstants.APPROVED, "待出库"), + APPROVED(MesOrderStatusConstants.APPROVED, "待执行出库"), /** * 已完成 + * + * 对应方法:{@link MesWmProductSalesService#executeProductSales(Long)} */ FINISHED(MesOrderStatusConstants.FINISHED, "已完成"), /** * 已取消 + * + * 对应方法:{@link MesWmProductSalesService#cancelProductSales(Long)} */ CANCELED(MesOrderStatusConstants.CANCELLED, "已取消"); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java index d45f056..dc62515 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java @@ -117,6 +117,7 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService { .setId(id).setStatus(MesWmProductSalesStatusEnum.APPROVING.getStatus())); } + // TODO @AI:前后端方法名,都改成 stock;保持整体都是对齐的; @Override @Transactional(rollbackFor = Exception.class) public void pickProductSales(Long id) { @@ -126,6 +127,7 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService { throw exception(WM_PRODUCT_SALES_CANNOT_PICK); } // 校验每行明细数量之和是否等于行出库数量 + // TODO @AI:这里挪成独立的 checkQuantiy 接口,不在这个方法里,保持对齐;然后前端调用;类似 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/returnvendor/ReturnVendorForm.vue 这种; List lines = productSalesLineService.getProductSalesLineListBySalesId(id); for (MesWmProductSalesLineDO line : lines) { List details = productSalesDetailService.getProductSalesDetailListByLineId(line.getId()); -- libgit2 0.21.4