From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorController.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 7 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 38c39e4..9c90de9 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,15 +8,19 @@
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;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.MesWmReturnVendorSaveReqVO;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDO;
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;
@@ -24,11 +28,13 @@
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.Map;
+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;
@@ -43,7 +49,7 @@
@Resource
private MesWmReturnVendorService returnVendorService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓渚涘簲鍟嗛��璐у崟")
@@ -103,12 +109,27 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦渚涘簲鍟嗛��璐у崟")
+ @Operation(summary = "鎻愪氦渚涘簲鍟嗛��璐у崟瀹℃壒锛堣崏绋库啋寰呮嫞璐э級锛屽鏍镐汉鐢卞鎵归厤缃粺涓�鎸囧畾")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:update')")
public CommonResult<Boolean> submitReturnVendor(@RequestParam("id") Long id) {
- returnVendorService.submitReturnVendor(id);
+ returnVendorService.submitReturnVendorApproval(id);
return success(true);
+ }
+
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳渚涘簲鍟嗛��璐у崟锛堝緟鎷ｈ揣鈫掑緟鎵ц閫�璐�/鑽夌锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:audit')")
+ public CommonResult<Boolean> auditReturnVendor(@Valid @RequestBody MesWmReturnVendorAuditReqVO auditReqVO) {
+ returnVendorService.auditReturnVendor(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱渚涘簲鍟嗛��璐у崟鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ @PreAuthorize("@ss.hasPermission('mes:wm-return-vendor:query')")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(returnVendorService.getReturnVendorApproverUserIds());
}
@PutMapping("/stock")
@@ -146,6 +167,36 @@
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.write(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) {
@@ -153,9 +204,9 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmReturnVendorDO::getVendorId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmReturnVendorRespVO.class, vo ->
MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
--
Gitblit v1.9.3