✨ feat(mes): 更新反馈和入库相关接口及状态管理

将多个接口的执行方法重命名为完成方法，增强语义清晰度。更新相关的权限控制和状态枚举，确保系统逻辑一致性。

✨ feat(mes): 更新反馈和入库相关接口及状态管理
将多个接口的执行方法重命名为完成方法，增强语义清晰度。更新相关的权限控制和状态枚举，确保系统逻辑一致性。
YunaiV
1 parent d20a5f54
Showing 23 changed files with 39 additions and 39 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/feedback/MesProFeedbackController.java
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/controller/admin/wm/productionissue/MesWmProductionIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.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/enums/wm/MesWmItemReceiptStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductReceiptStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnSalesStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
@@ -154,12 +154,12 @@ public class MesProFeedbackController {
         return success(true);
     }
  
-    @PutMapping("/execute")
+    @PutMapping("/finish")
     @Operation(summary = "执行报工")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:update')")
-    public CommonResult<Boolean> executeFeedback(@RequestParam("id") Long id) {
-        feedbackService.executeFeedback(id);
+    @PreAuthorize("@ss.hasPermission('mes:pro-feedback:finish')")
+    public CommonResult<Boolean> finishFeedback(@RequestParam("id") Long id) {
+        feedbackService.finishFeedback(id);
         return success(true);
     }
  
@@ -137,12 +137,12 @@ public class MesWmItemReceiptController {
         return success(true);
     }
  
-    @PutMapping("/execute")
+    @PutMapping("/finish")
     @Operation(summary = "执行入库")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:execute')")
-    public CommonResult<Boolean> executeItemReceipt(@RequestParam("id") Long id) {
-        itemReceiptService.executeItemReceipt(id);
+    @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:finish')")
+    public CommonResult<Boolean> finishItemReceipt(@RequestParam("id") Long id) {
+        itemReceiptService.finishItemReceipt(id);
         return success(true);
     }
  
@@ -109,7 +109,7 @@ public class MesWmProductionIssueController {
     @PutMapping("/finish")
     @Operation(summary = "完成领料出库单")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-production-issue:execute')")
+    @PreAuthorize("@ss.hasPermission('mes:wm-production-issue:finish')")
     public CommonResult<Boolean> finishProductionIssue(@RequestParam("id") Long id) {
         issueService.finishProductionIssue(id);
         return success(true);
@@ -131,12 +131,12 @@ public class MesWmProductReceiptController {
         return success(true);
     }
  
-    @PutMapping("/execute")
+    @PutMapping("/finish")
     @Operation(summary = "执行入库")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:execute')")
-    public CommonResult<Boolean> executeProductReceipt(@RequestParam("id") Long id) {
-        productReceiptService.executeProductReceipt(id);
+    @PreAuthorize("@ss.hasPermission('mes:wm-product-receipt:finish')")
+    public CommonResult<Boolean> finishProductReceipt(@RequestParam("id") Long id) {
+        productReceiptService.finishProductReceipt(id);
         return success(true);
     }
  
@@ -138,12 +138,12 @@ public class MesWmProductSalesController {
         return success(true);
     }
  
-    @PutMapping("/execute")
+    @PutMapping("/finish")
     @Operation(summary = "执行出库")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:execute')")
-    public CommonResult<Boolean> executeProductSales(@RequestParam("id") Long id) {
-        productSalesService.executeProductSales(id);
+    @PreAuthorize("@ss.hasPermission('mes:wm-product-sales:finish')")
+    public CommonResult<Boolean> finishProductSales(@RequestParam("id") Long id) {
+        productSalesService.finishProductSales(id);
         return success(true);
     }
  
@@ -109,7 +109,7 @@ public class MesWmReturnIssueController {
     @PutMapping("/finish")
     @Operation(summary = "完成生产退料单")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:execute')")
+    @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:finish')")
     public CommonResult<Boolean> finishReturnIssue(@RequestParam("id") Long id) {
         issueService.finishReturnIssue(id);
         return success(true);
@@ -116,12 +116,12 @@ public class MesWmReturnSalesController {
         return success(true);
     }
  
-    @PutMapping("/execute")
+    @PutMapping("/finish")
     @Operation(summary = "执行退货")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:execute')")
-    public CommonResult<Boolean> executeReturnSales(@RequestParam("id") Long id) {
-        returnSalesService.executeReturnSales(id);
+    @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:finish')")
+    public CommonResult<Boolean> finishReturnSales(@RequestParam("id") Long id) {
+        returnSalesService.finishReturnSales(id);
         return success(true);
     }
  
@@ -123,7 +123,7 @@ public class MesWmReturnVendorController {
     @PutMapping("/finish")
     @Operation(summary = "完成供应商退货单")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:execute')")
+    @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:finish')")
     public CommonResult<Boolean> finishReturnVendor(@RequestParam("id") Long id) {
         returnVendorService.finishReturnVendor(id);
         return success(true);
@@ -434,7 +434,7 @@ public interface ErrorCodeConstants {
     ErrorCode WM_PRODUCT_SALES_CANNOT_SUBMIT = new ErrorCode(1_040_714_004, "当前状态不允许提交");
     ErrorCode WM_PRODUCT_SALES_CANNOT_PICK = new ErrorCode(1_040_714_005, "当前状态不允许拣货");
     ErrorCode WM_PRODUCT_SALES_CANNOT_SHIPPING = new ErrorCode(1_040_714_006, "当前状态不允许填写运单");
-    ErrorCode WM_PRODUCT_SALES_CANNOT_EXECUTE = new ErrorCode(1_040_714_007, "当前状态不允许执行出库");
+    ErrorCode WM_PRODUCT_SALES_CANNOT_FINISH = new ErrorCode(1_040_714_007, "当前状态不允许执行出库");
     ErrorCode WM_PRODUCT_SALES_CANNOT_CANCEL = new ErrorCode(1_040_714_008, "当前状态不允许取消");
     ErrorCode WM_PRODUCT_SALES_DETAILS_EMPTY = new ErrorCode(1_040_714_009, "拣货明细不能为空");
     ErrorCode WM_PRODUCT_SALES_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_714_010, "拣货数量与出库数量不匹配");
@@ -39,7 +39,7 @@ public enum MesWmItemReceiptStatusEnum implements ArrayValuable&lt;Integer&gt; {
     /**
      * 已完成
      *
-     * 对应方法：{@link MesWmItemReceiptService#executeItemReceipt(Long)}
+     * 对应方法：{@link MesWmItemReceiptService#finishItemReceipt(Long)}
      */
     FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
     /**
@@ -39,7 +39,7 @@ public enum MesWmProductReceiptStatusEnum implements ArrayValuable&lt;Integer&gt; {
     /**
      * 已完成
      *
-     * 对应方法：{@link MesWmProductReceiptService#executeProductReceipt(Long)}
+     * 对应方法：{@link MesWmProductReceiptService#finishProductReceipt(Long)}
      */
     FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
     /**
@@ -48,7 +48,7 @@ public enum MesWmProductSalesStatusEnum implements ArrayValuable&lt;Integer&gt; {
     /**
      * 已完成
      *
-     * 对应方法：{@link MesWmProductSalesService#executeProductSales(Long)}
+     * 对应方法：{@link MesWmProductSalesService#finishProductSales(Long)}
      */
     FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
     /**
@@ -31,7 +31,7 @@ public enum MesWmReturnSalesStatusEnum implements ArrayValuable&lt;Integer&gt; {
     /**
      * 待上架
      *
-     * 对应方法：{@link cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService#executeReturnSales}
+     * 对应方法：{@link cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesService#finishReturnSales}
      */
     APPROVED(MesOrderStatusConstants.APPROVED, "待上架"),
     /**
@@ -70,7 +70,7 @@ public interface MesProFeedbackService {
      *
      * @param id 编号
      */
-    void executeFeedback(Long id);
+    void finishFeedback(Long id);
  
     /**
      * 取消报工
@@ -108,7 +108,7 @@ public class MesProFeedbackServiceImpl implements MesProFeedbackService {
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeFeedback(Long id) {
+    public void finishFeedback(Long id) {
         // 1. 校验存在 + 审批中状态
         MesProFeedbackDO feedback = validateFeedbackStatusApproving(id);
  
@@ -68,7 +68,7 @@ public interface MesWmItemReceiptService {
      *
      * @param id 编号
      */
-    void executeItemReceipt(Long id);
+    void finishItemReceipt(Long id);
  
     /**
      * 取消采购入库单（任意非已完成/已取消状态 → 已取消）
@@ -139,7 +139,7 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeItemReceipt(Long id) {
+    public void finishItemReceipt(Long id) {
         // 校验存在
         MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
         if (ObjUtil.notEqual(MesWmItemReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
@@ -68,7 +68,7 @@ public interface MesWmProductReceiptService {
      *
      * @param id 编号
      */
-    void executeProductReceipt(Long id);
+    void finishProductReceipt(Long id);
  
     /**
      * 取消产品收货单（任意非已完成/已取消状态 → 已取消）
@@ -153,7 +153,7 @@ public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptServic
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeProductReceipt(Long id) {
+    public void finishProductReceipt(Long id) {
         // 校验存在
         MesWmProductReceiptDO receipt = validateProductReceiptExists(id);
         if (ObjUtil.notEqual(MesWmProductReceiptStatusEnum.APPROVED.getStatus(), receipt.getStatus())) {
@@ -86,7 +86,7 @@ public interface MesWmProductSalesService {
      *
      * @param id 编号
      */
-    void executeProductSales(Long id);
+    void finishProductSales(Long id);
  
     /**
      * 取消销售出库单（任意非已完成/已取消状态 → 已取消）
@@ -169,11 +169,11 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeProductSales(Long id) {
+    public void finishProductSales(Long id) {
         // 校验存在
         MesWmProductSalesDO sales = validateProductSalesExists(id);
         if (ObjUtil.notEqual(MesWmProductSalesStatusEnum.APPROVED.getStatus(), sales.getStatus())) {
-            throw exception(WM_PRODUCT_SALES_CANNOT_EXECUTE);
+            throw exception(WM_PRODUCT_SALES_CANNOT_FINISH);
         }
  
         // 遍历所有明细，扣减库存
@@ -71,7 +71,7 @@ public interface MesWmReturnSalesService {
      *
      * @param id 编号
      */
-    void executeReturnSales(Long id);
+    void finishReturnSales(Long id);
  
     /**
      * 执行上架（待上架 -> 已完成），更新库存台账
@@ -122,7 +122,7 @@ public class MesWmReturnSalesServiceImpl implements MesWmReturnSalesService {
  
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeReturnSales(Long id) {
+    public void finishReturnSales(Long id) {
         // 校验存在
         MesWmReturnSalesDO returnSales = validateReturnSalesExists(id);
         if (ObjUtil.notEqual(MesWmReturnSalesStatusEnum.APPROVING.getStatus(), returnSales.getStatus())) {