From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
index 88ea25b..9c63027 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java
@@ -5,6 +5,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.wm.miscreceipt.vo.MesWmMiscReceiptAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscreceipt.vo.MesWmMiscReceiptSaveReqVO;
@@ -12,6 +15,7 @@
import cn.iocoder.yudao.module.mes.service.wm.miscreceipt.MesWmMiscReceiptService;
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;
@@ -19,9 +23,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;
@@ -77,21 +84,27 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦鏉傞」鍏ュ簱鍗曞鎵�")
+ @Operation(summary = "鎻愪氦鏉傞」鍏ュ簱鍗曞鎵癸紙鑽夌鈫掑鎵逛腑锛夛紝瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:submit')")
- public CommonResult<Boolean> submitMiscReceipt(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- miscReceiptService.submitMiscReceiptApproval(id, processDefinitionKey);
+ public CommonResult<Boolean> submitMiscReceipt(@RequestParam("id") Long id) {
+ miscReceiptService.submitMiscReceiptApproval(id);
return success(true);
}
- @GetMapping("/approval-process-list")
- @Operation(summary = "鑾峰緱鏉傞」鍏ュ簱瀹℃壒娴佺▼瀹氫箟鍒楄〃")
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳鏉傞」鍏ュ簱鍗曪紙瀹℃壒涓啋宸插鎵�/鑽夌锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:audit')")
+ public CommonResult<Boolean> auditMiscReceipt(@Valid @RequestBody MesWmMiscReceiptAuditReqVO auditReqVO) {
+ miscReceiptService.auditMiscReceipt(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱鏉傞」鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
- public CommonResult<List<java.util.Map<String, Object>>> getApprovalProcessList() {
- return success(miscReceiptService.getMiscReceiptApprovalProcessDefinitionList());
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(miscReceiptService.getMiscReceiptApproverUserIds());
}
@PutMapping("/finish")
@@ -124,4 +137,32 @@
BeanUtils.toBean(list, MesWmMiscReceiptRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鏉傞」鍏ュ簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmMiscReceiptImportExcelVO> list = Collections.singletonList(
+ MesWmMiscReceiptImportExcelVO.builder()
+ .code("MR20260302001").name("绀轰緥鏉傞」鍏ュ簱鍗�").type(1)
+ .receiptDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
+ .sourceDocType("").sourceDocCode("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鏉傞」鍏ュ簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍏ュ簱鍗曞垪琛�", MesWmMiscReceiptImportExcelVO.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:wm:misc-receipt:import')")
+ public CommonResult<MesWmMiscReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmMiscReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmMiscReceiptImportExcelVO.class);
+ return success(miscReceiptService.importMiscReceiptList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3