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;