From 883f5e73fbe7458fd760dbe8560dd5d8757e04cd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 13:56:29 +0800
Subject: [PATCH] refactor: 按需求表收敛范围，撤销非需求模块，补齐售后回访闭环
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 40c8f34..b458f4c 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
@@ -6,6 +6,8 @@
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;
@@ -13,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;
@@ -20,8 +23,10 @@
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;
@@ -64,7 +69,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鏉傞」鍏ュ簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
public CommonResult<MesWmMiscReceiptRespVO> getMiscReceipt(@RequestParam("id") Long id) {
MesWmMiscReceiptDO receipt = miscReceiptService.getMiscReceipt(id);
return success(BeanUtils.toBean(receipt, MesWmMiscReceiptRespVO.class));
@@ -72,7 +76,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鏉傞」鍏ュ簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
public CommonResult<PageResult<MesWmMiscReceiptRespVO>> getMiscReceiptPage(@Valid MesWmMiscReceiptPageReqVO pageReqVO) {
PageResult<MesWmMiscReceiptDO> pageResult = miscReceiptService.getMiscReceiptPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesWmMiscReceiptRespVO.class));
@@ -97,7 +100,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱鏉傞」鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
- @PreAuthorize("@ss.hasPermission('mes:wm:misc-receipt:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(miscReceiptService.getMiscReceiptApproverUserIds());
}
@@ -132,4 +134,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.writeTemplate(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