From 6fa82a1ad7c3ae061ef499f0d0806a16846e122b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 16:55:02 +0800
Subject: [PATCH] feat(mes): 来料检验与不合格退货闭环优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 94c1b38..0a65c24 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -109,13 +109,29 @@
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductUnitId));
- return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO ->
- purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
- MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
- .setProductBarCode(mdmItem.getBarCode()));
- MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
- item.setProductUnitName(unit.getName()));
- })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id))));
+ // 渚涘簲鍟� / 鐢宠浜� / 鐢宠閮ㄩ棬鍚嶇О锛氬鎵硅鎯呴〉鐩存帴灞曠ず璇ユ帴鍙ｇ殑鏁版嵁锛岀己澶变細鏄剧ず涓衡��-鈥�
+ List<ErpPurchaseRequestDO> singleList = java.util.Collections.singletonList(purchaseRequest);
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(singleList, ErpPurchaseRequestDO::getSupplierId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(singleList, ErpPurchaseRequestDO::getRequestUserId));
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
+ convertSet(singleList, ErpPurchaseRequestDO::getRequestDeptId));
+ return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO -> {
+ purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
+ item.setProductUnitName(unit.getName()));
+ })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id));
+ MapUtils.findAndThen(supplierMap, purchaseRequestVO.getSupplierId(),
+ supplier -> purchaseRequestVO.setSupplierName(supplier.getName()));
+ MapUtils.findAndThen(userMap, purchaseRequestVO.getRequestUserId(),
+ user -> purchaseRequestVO.setRequestUserName(user.getNickname()));
+ MapUtils.findAndThen(deptMap, purchaseRequestVO.getRequestDeptId(),
+ dept -> purchaseRequestVO.setRequestDeptName(dept.getName()));
+ }));
}
@GetMapping("/page")
@@ -142,12 +158,11 @@
public void importTemplate(HttpServletResponse response) throws IOException {
List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
ErpPurchaseRequestImportExcelVO.builder()
- .no("CGSQ20260101000001").supplierName("绀轰緥渚涘簲鍟�")
+ .no("CGSQ20260101000001")
.requestTime("2026-01-01 10:00:00").requestReason("绀轰緥锛氱敓浜ч渶瑕�")
.productCode("ITEM001").productName("绀轰緥浜у搧A")
- .count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
- .taxPercent(new BigDecimal("13")).demandTime("2026-01-10")
- .qcCheckFlag("鍚�").remark("绀轰緥").build());
+ .count(new BigDecimal("100")).demandTime("2026-01-10")
+ .remark("绀轰緥").build());
ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠", ErpPurchaseRequestImportExcelVO.class, list);
}
@@ -189,7 +204,7 @@
@Operation(summary = "鐢熸垚閲囪喘璁㈠崟")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:generate-order')")
public CommonResult<Long> generatePurchaseOrder(@RequestParam("id") Long id,
- @RequestParam("supplierId") Long supplierId) {
+ @RequestParam(value = "supplierId", required = false) Long supplierId) {
return success(purchaseRequestService.generatePurchaseOrder(id, supplierId));
}
--
Gitblit v1.9.3