From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/techconfirm/ProductTechConfirmController.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 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..fcdf832 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,9 @@
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.ProductTechConfirmImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.techconfirm.vo.ProductTechConfirmImportRespVO;
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;
@@ -13,6 +16,7 @@
import cn.iocoder.yudao.module.mes.service.pd.techconfirm.ProductTechConfirmService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -20,10 +24,12 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
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 +59,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,10 +67,43 @@
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 = "鑾峰緱鎶�鏈‘璁ゅ嚱鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ 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")
- @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:query')")
public CommonResult<ProductTechConfirmRespVO> getTechConfirm(@RequestParam("id") Long id) {
ProductTechConfirmDO techConfirm = techConfirmService.getTechConfirm(id);
if (techConfirm == null) {
@@ -75,7 +114,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱浜у搧鎶�鏈‘璁ゅ嚱鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:query')")
public CommonResult<PageResult<ProductTechConfirmRespVO>> getTechConfirmPage(@Valid ProductTechConfirmPageReqVO pageReqVO) {
PageResult<ProductTechConfirmDO> pageResult = techConfirmService.getTechConfirmPage(pageReqVO);
return success(new PageResult<>(BeanUtils.toBean(pageResult.getList(), ProductTechConfirmRespVO.class),
@@ -94,4 +132,30 @@
BeanUtils.toBean(list, ProductTechConfirmRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱浜у搧鎶�鏈‘璁ゅ嚱瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<ProductTechConfirmImportExcelVO> list = Collections.singletonList(
+ ProductTechConfirmImportExcelVO.builder()
+ .confirmNo("TC20260801001").customerName("姹熻嫃鍗庨箯鍙樺帇鍣ㄦ湁闄愬叕鍙�")
+ .productName("婕嗗寘鎵侀摐绾�").specification("QQNB-2/120")
+ .techParams("{\"thickness\":\"1.27\"}").templateType("general").remark("").build()
+ );
+ ExcelUtils.write(response, "浜у搧鎶�鏈‘璁ゅ嚱瀵煎叆妯℃澘.xls", "浜у搧鎶�鏈‘璁ゅ嚱鍒楄〃", ProductTechConfirmImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆浜у搧鎶�鏈‘璁ゅ嚱")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:pd-tech-confirm:import')")
+ public CommonResult<ProductTechConfirmImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<ProductTechConfirmImportExcelVO> list = ExcelUtils.read(file, ProductTechConfirmImportExcelVO.class);
+ return success(techConfirmService.importTechConfirmList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3