From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 f1f72b0..270196f 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
@@ -44,6 +44,8 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -112,13 +114,25 @@
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))));
+ // 渚涘簲鍟� / 鐢宠浜� / 鐢宠閮ㄩ棬鍚嶇О锛堝崟鏉¤鎯呬笌鍒嗛〉淇濇寔涓�鑷达紝瀹℃壒璇︽儏椤典緷璧栬繖浜涘悕绉帮級
+ Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
+ convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getSupplierId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getRequestUserId));
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
+ convertSet(Collections.singletonList(purchaseRequest), 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()));
+ }));
+ 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()));
+ purchaseRequestVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id));
+ }));
}
@GetMapping("/page")
@@ -221,9 +235,8 @@
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
// 1.3 渚涘簲鍟嗕俊鎭�
- Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
- convertSet(pageResult.getList(), ErpPurchaseRequestDO::getSupplierId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
+ convertSet(pageResult.getList(), ErpPurchaseRequestDO::getSupplierId));
// 1.4 鐢ㄦ埛淇℃伅
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(pageResult.getList(), ErpPurchaseRequestDO::getRequestUserId));
@@ -242,4 +255,9 @@
});
}
-}
\ No newline at end of file
+ private Map<Long, SrmSupplierRespDTO> getSupplierMap(Collection<Long> supplierIds) {
+ return srmSupplierApi.getSupplierList(supplierIds).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ }
+
+}
--
Gitblit v1.9.3