From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
index dbbce88..2e008d5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.returnvendor.vo.MesWmReturnVendorImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorRespVO;
@@ -18,6 +20,7 @@
import cn.iocoder.yudao.module.mes.service.wm.returnvendor.MesWmReturnVendorService;
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;
@@ -25,6 +28,7 @@
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;
@@ -74,7 +78,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<MesWmReturnVendorRespVO> getReturnVendor(@RequestParam("id") Long id) {
MesWmReturnVendorDO returnVendor = returnVendorService.getReturnVendor(id);
if (returnVendor == null) {
@@ -85,7 +88,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<PageResult<MesWmReturnVendorRespVO>> getReturnVendorPage(
@Valid MesWmReturnVendorPageReqVO pageReqVO) {
PageResult<MesWmReturnVendorDO> pageResult = returnVendorService.getReturnVendorPage(pageReqVO);
@@ -123,7 +125,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(returnVendorService.getReturnVendorApproverUserIds());
}
@@ -158,11 +159,40 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙渚涘簲鍟嗛��璐у崟鏁伴噺", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛岄��璐ф暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
public CommonResult<Boolean> checkReturnVendorQuantity(@RequestParam("id") Long id) {
return success(returnVendorService.checkReturnVendorQuantity(id));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmReturnVendorImportExcelVO> list = Collections.singletonList(
+ MesWmReturnVendorImportExcelVO.builder()
+ .code("RV20250226001").name("绀轰緥渚涘簲鍟嗛��璐у崟")
+ .purchaseOrderCode("PO20250226001")
+ .returnDate(java.time.LocalDateTime.of(2026, 3, 1, 10, 0, 0))
+ .transportCode("SF1234567890")
+ .returnReason("璐ㄩ噺涓嶅悎鏍�").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "渚涘簲鍟嗛��璐у崟瀵煎叆妯℃澘.xls", "渚涘簲鍟嗛��璐у崟鍒楄〃", MesWmReturnVendorImportExcelVO.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-return-vendor:import')")
+ public CommonResult<MesWmReturnVendorImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmReturnVendorImportExcelVO> list = ExcelUtils.read(file, MesWmReturnVendorImportExcelVO.class);
+ return success(returnVendorService.importReturnVendorList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmReturnVendorRespVO> buildRespVOList(List<MesWmReturnVendorDO> list) {
--
Gitblit v1.9.3