From c6b80dd2afe2369286f1310ba54ecbbc6ac2e82c Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Tue, 23 Dec 2025 15:55:27 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-23=E7=89=A9=E8=B5=84=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B6=8B=E5=8A=BF=E5=AF=B9=E6=AF=94bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialsManagementServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MaterialsManagementServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MaterialsManagementServiceImpl.java index 95f865d3..6fb67cac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MaterialsManagementServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MaterialsManagementServiceImpl.java @@ -315,11 +315,22 @@ public class MaterialsManagementServiceImpl implements IMaterialsManagementServi MatMaterialsUseRecord::getInventoryId, Collectors.reducing(BigDecimal.ZERO, MatMaterialsUseRecord::getUseNumber, BigDecimal::add) )); + Map map2 = new HashMap<>(); + for (MatMaterialsInventory item : inventories) { + if (!map.containsKey(item.getId())) { + continue; + } + if (map2.containsKey(item.getMaterialsId())){ + map2.put(item.getMaterialsId(), map2.get(item.getMaterialsId()).add(map.getOrDefault(item.getId(), BigDecimal.ZERO))); + }else { + map2.put(item.getMaterialsId(), map.getOrDefault(item.getId(), BigDecimal.ZERO)); + } + } inventoryHashMap.forEach((key, value) -> { xhqsdbVo vo = new xhqsdbVo(); vo.setName(map1.get(key)); vo.setOutTotalPrices( value); - vo.setUseTotalPrices(map.getOrDefault(key, BigDecimal.ZERO)); + vo.setUseTotalPrices(map2.getOrDefault(key, BigDecimal.ZERO)); list.add(vo); }); return list;