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-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
index 22cdb28..29c15ca 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/material/MesProMaterialRequirementServiceImpl.java
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -117,6 +118,10 @@
}
continue;
}
+ // 椤剁骇浜у搧娌℃湁浠讳綍涓嬬骇 BOM 鏃讹紝璇存槑灏氭湭缁存姢 BOM锛屼笉鑳芥妸浜у搧鑷韩褰撴垚杈呮枡
+ if (entry.getKey().equals(productId)) {
+ continue;
+ }
// 鏃犱笅绾� BOM锛岃涓哄彾瀛愮墿鏂欙紙澶栬喘浠讹級
leafItems.merge(entry.getKey(), qty, BigDecimal::add);
}
@@ -141,8 +146,16 @@
convertSet(itemMap.values(), MesMdItemDO::getItemTypeId));
// 2. 鎵归噺鏌ヨ搴撳瓨锛屾寜 itemId 姹囨�诲彲鐢ㄩ噺锛堝湪搴� - 鍐荤粨 - 鍗犵敤锛�
+ // 搴撳瓨琛ㄥ瓨鐨勬槸 mdm_item_id锛岃�� BOM 灞曞紑寰楀埌鐨勬槸 mes_md_item.id锛岄渶瑕佸厛鎹㈢畻鍐嶆煡搴撳瓨
Map<Long, BigDecimal> stockMap = new HashMap<>();
- List<MesWmMaterialStockDO> stockList = materialStockMapper.selectListByItemIds(requirements.keySet());
+ Map<Long, Long> mesToMdmItemId = new HashMap<>();
+ for (MesMdItemDO item : itemMap.values()) {
+ if (item.getMdmItemId() != null) {
+ mesToMdmItemId.put(item.getId(), item.getMdmItemId());
+ }
+ }
+ List<MesWmMaterialStockDO> stockList = materialStockMapper.selectListByItemIds(
+ new HashSet<>(mesToMdmItemId.values()));
for (MesWmMaterialStockDO stock : stockList) {
BigDecimal available = nullToZero(stock.getQuantity())
.subtract(nullToZero(stock.getFrozenQuantity()))
@@ -160,7 +173,8 @@
continue;
}
BigDecimal requiredQty = entry.getValue();
- BigDecimal stockQty = stockMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ BigDecimal stockQty = stockMap.getOrDefault(
+ mesToMdmItemId.getOrDefault(item.getId(), item.getId()), BigDecimal.ZERO);
BigDecimal purchaseQty = purchaseOrderQtyMap.getOrDefault(item.getId(), BigDecimal.ZERO);
MesProWorkOrderItemRespVO vo = new MesProWorkOrderItemRespVO()
.setItemId(item.getId()).setQuantity(requiredQty)
--
Gitblit v1.9.3