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/pd/techconfirm/ProductTechConfirmController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
index 05cdfc2..a1490b0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java
@@ -6,6 +6,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmSaveReqVO;
@@ -22,8 +23,8 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.Collections;
import java.util.List;
+import java.util.Set;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -53,7 +54,7 @@
}
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎浜у搧鎶�鏈‘璁ゅ嚱")
+ @Operation(summary = "鍒犻櫎浜у搧鎶�鏈‘璁ゅ嚱锛堜粎鑽夌 / 瀹℃牳涓嶉�氳繃鐘舵�佸彲鍒犻櫎锛�")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:delete')")
public CommonResult<Boolean> deleteTechConfirm(@RequestParam("id") Long id) {
@@ -61,6 +62,41 @@
return success(true);
}
+ @PutMapping("/submit-approval")
+ @Operation(summary = "鎻愪氦鎶�鏈‘璁ゅ嚱瀹℃牳锛堣崏绋�/瀹℃牳涓嶉�氳繃鈫掑緟瀹℃牳锛夛紝瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:update')")
+ public CommonResult<Boolean> submitTechConfirmAudit(@RequestParam("id") Long id) {
+ techConfirmService.submitTechConfirmAudit(id);
+ return success(true);
+ }
+
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳鎶�鏈‘璁ゅ嚱锛堝緟瀹℃牳鈫掑凡瀹℃牳/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:audit')")
+ public CommonResult<Boolean> auditTechConfirm(@Valid @RequestBody ProductTechConfirmAuditReqVO auditReqVO) {
+ techConfirmService.auditTechConfirm(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱鎶�鏈‘璁ゅ嚱鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:query')")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(techConfirmService.getTechConfirmApproverUserIds());
+ }
+
+ @PutMapping("/customer-confirm")
+ @Operation(summary = "瀹㈡埛纭锛堝凡瀹℃牳鈫掑鎴峰凡纭锛�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @Parameter(name = "customerConfirmUser", description = "瀹㈡埛纭浜哄鍚�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:update')")
+ public CommonResult<Boolean> confirmTechConfirmByCustomer(@RequestParam("id") Long id,
+ @RequestParam("customerConfirmUser") String customerConfirmUser) {
+ techConfirmService.confirmTechConfirmByCustomer(id, customerConfirmUser);
+ return success(true);
+ }
+
@GetMapping("/get")
@Operation(summary = "鑾峰緱浜у搧鎶�鏈‘璁ゅ嚱")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
--
Gitblit v1.9.3