From a4ed0f250009167453ca637ce042ef8e0b69f613 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 24 十月 2026 19:30:00 +0800
Subject: [PATCH] feat(aftersales): 增加售后退货流程管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
index a5b1ed9..841f37a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
@@ -7,6 +7,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.miscissue.vo.MesWmMiscIssueAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO;
@@ -14,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.wm.miscissue.MesWmMiscIssueService;
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;
@@ -21,10 +25,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;
@@ -96,21 +102,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-issue:update')")
- public CommonResult<Boolean> submitMiscIssue(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- miscIssueService.submitMiscIssueApproval(id, processDefinitionKey);
+ public CommonResult<Boolean> submitMiscIssue(@RequestParam("id") Long id) {
+ miscIssueService.submitMiscIssueApproval(id);
return success(true);
}
- @GetMapping("/approval-process-list")
- @Operation(summary = "鑾峰緱鏉傞」鍑哄簱瀹℃壒娴佺▼瀹氫箟鍒楄〃")
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳鏉傞」鍑哄簱鍗曪紙瀹℃壒涓啋寰呮墽琛屽嚭搴�/鑽夌锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:audit')")
+ public CommonResult<Boolean> auditMiscIssue(@Valid @RequestBody MesWmMiscIssueAuditReqVO auditReqVO) {
+ miscIssueService.auditMiscIssue(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
- public CommonResult<List<java.util.Map<String, Object>>> getApprovalProcessList() {
- return success(miscIssueService.getMiscIssueApprovalProcessDefinitionList());
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(miscIssueService.getMiscIssueApproverUserIds());
}
@PutMapping("/finish")
@@ -131,6 +143,34 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmMiscIssueImportExcelVO> list = Collections.singletonList(
+ MesWmMiscIssueImportExcelVO.builder()
+ .code("MI20260302001").name("绀轰緥鏉傞」鍑哄簱鍗�").type(1)
+ .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
+ .sourceDocType("").sourceDocCode("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鏉傞」鍑哄簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍑哄簱鍗曞垪琛�", MesWmMiscIssueImportExcelVO.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-issue:import')")
+ public CommonResult<MesWmMiscIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmMiscIssueImportExcelVO> list = ExcelUtils.read(file, MesWmMiscIssueImportExcelVO.class);
+ return success(miscIssueService.importMiscIssueList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmMiscIssueRespVO> buildRespVOList(List<MesWmMiscIssueDO> list) {
--
Gitblit v1.9.3