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/itemreceipt/MesWmItemReceiptController.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
index deb0f72..c2309a8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -8,6 +8,9 @@
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.itemreceipt.vo.MesWmItemReceiptAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
@@ -17,10 +20,11 @@
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
-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 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;
@@ -28,11 +32,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;
@@ -47,7 +53,7 @@
@Resource
private MesWmItemReceiptService itemReceiptService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesQcIqcService iqcService;
@Resource
@@ -111,12 +117,27 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦閲囪喘鍏ュ簱鍗�")
+ @Operation(summary = "鎻愪氦閲囪喘鍏ュ簱鍗曞鎵癸紙鑽夌鈫掑緟涓婃灦锛夛紝瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')")
public CommonResult<Boolean> submitItemReceipt(@RequestParam("id") Long id) {
itemReceiptService.submitItemReceipt(id);
return success(true);
+ }
+
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳閲囪喘鍏ュ簱鍗曪紙寰呬笂鏋垛啋寰呮墽琛屽叆搴�/鑽夌锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:audit')")
+ public CommonResult<Boolean> auditItemReceipt(@Valid @RequestBody MesWmItemReceiptAuditReqVO auditReqVO) {
+ itemReceiptService.auditItemReceipt(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
+ @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:query')")
+ public CommonResult<Set<Long>> approverIds() {
+ return success(itemReceiptService.getItemReceiptApproverUserIds());
}
@PutMapping("/stock")
@@ -154,15 +175,33 @@
return success(itemReceiptService.generateItemReceiptFromArrivalNotice(arrivalNoticeId));
}
- @PutMapping("/submit-approval")
- @Operation(summary = "鎻愪氦閲囪喘鍏ュ簱鍗曞鎵�")
- @Parameter(name = "id", description = "鍏ュ簱鍗曠紪鍙�", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-item-receipt:update')")
- public CommonResult<Boolean> submitApproval(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- itemReceiptService.submitItemReceiptApproval(id, processDefinitionKey);
- return success(true);
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmItemReceiptImportExcelVO> list = Collections.singletonList(
+ MesWmItemReceiptImportExcelVO.builder()
+ .code("RK001").name("绀轰緥閲囪喘鍏ュ簱鍗�")
+ .purchaseOrderCode("PO001")
+ .receiptDate(java.time.LocalDateTime.now())
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "閲囪喘鍏ュ簱鍗曞鍏ユā鏉�.xls", "閲囪喘鍏ュ簱鍗曞垪琛�", MesWmItemReceiptImportExcelVO.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-item-receipt:import')")
+ public CommonResult<MesWmItemReceiptImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmItemReceiptImportExcelVO> list = ExcelUtils.read(file, MesWmItemReceiptImportExcelVO.class);
+ return success(itemReceiptService.importItemReceiptList(list, updateSupport));
}
// ==================== 鎷兼帴 VO ====================
@@ -172,9 +211,9 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁锛堥噰璐叆搴撲娇鐢� ERP 渚涘簲鍟嗭級
- Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmItemReceiptDO::getVendorId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
Map<Long, MesQcIqcDO> iqcMap = iqcService.getIqcMap(
convertSet(list, MesWmItemReceiptDO::getIqcId));
Map<Long, MesWmArrivalNoticeDO> noticeMap = arrivalNoticeService.getArrivalNoticeMap(
--
Gitblit v1.9.3