From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
index d9cab39..a8addf4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/equipmentreceipt/MesWmEquipmentReceiptController.java
@@ -15,8 +15,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -68,19 +67,26 @@
}
@PutMapping("/submit-approval")
- @Operation(summary = "鎻愪氦璁惧鍏ュ簱鍗曞鎵�")
+ @Operation(summary = "鎻愪氦璁惧鍏ュ簱鍗曞鎵癸紙鑽夌鈫掑鎵逛腑锛夛紝瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:submit')")
- public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- equipmentReceiptService.submitEquipmentReceiptApproval(id, processDefinitionKey);
+ public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id) {
+ equipmentReceiptService.submitEquipmentReceiptApproval(id);
return success(true);
}
- @GetMapping("/approval-process-list")
- @Operation(summary = "鑾峰緱璁惧鍏ュ簱瀹℃壒娴佺▼瀹氫箟鍒楄〃")
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳璁惧鍏ュ簱鍗曪紙瀹℃壒涓啋宸插鎵�/鑽夌锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:audit')")
+ public CommonResult<Boolean> audit(@Valid @RequestBody MesWmEquipmentReceiptAuditReqVO auditReqVO) {
+ equipmentReceiptService.auditEquipmentReceipt(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱璁惧鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('mes:wm:equipment-receipt:query')")
- public CommonResult<List<Map<String, Object>>> approvalProcessList() {
- return success(equipmentReceiptService.getEquipmentReceiptApprovalProcessDefinitionList());
+ public CommonResult<Set<Long>> approverIds() {
+ return success(equipmentReceiptService.getEquipmentReceiptApproverUserIds());
}
@PutMapping("/finish")
--
Gitblit v1.9.3