修改盘库显示结果

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -43,9 +43,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventoryMapper, BussinessInventory>
@@ -225,15 +223,33 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                     sumreq.setSizeIds(sizeIds);
                 }
 
-            List<EquipmentListDto> eqList=new ArrayList<>();
-            Integer totalNumber=0;
+            List<EquipmentListDto> eqList = new ArrayList<>();
+            Integer totalNumber = 0;
+
+// 使用Map来追踪已经处理过的数据
+            Map<String, EquipmentListDto> processedData = new HashMap<>();
+
             List<InventorySummary> SumResult = inventorySummaryService.getEquipmentInfoList(sumreq);
+
             for (InventorySummary summary : SumResult) {
-                EquipmentListDto eq=new EquipmentListDto();
-                BeanPlusUtil.copyProperties(summary,eq);
-                eq.setPlanNum(String.valueOf(summary.getStockNumber()));
-                totalNumber+=summary.getStockNumber();
-                eqList.add(eq);
+                String key = summary.getSizeId() + "-" + summary.getTypeId();
+
+                if (processedData.containsKey(key)) {
+                    // 如果已经存在相同的key，更新已有的数据
+                    EquipmentListDto existingDto = processedData.get(key);
+                    existingDto.setPlanNum(String.valueOf(Integer.parseInt(existingDto.getPlanNum()) + summary.getStockNumber()));
+                    totalNumber += summary.getStockNumber();
+                } else {
+                    // 如果是新的key，创建新的EquipmentListDto并添加到eqList中
+                    EquipmentListDto eq = new EquipmentListDto();
+                    BeanPlusUtil.copyProperties(summary, eq);
+                    eq.setPlanNum(String.valueOf(summary.getStockNumber()));
+                    totalNumber += summary.getStockNumber();
+                    eqList.add(eq);
+
+                    // 将新的数据放入Map中
+                    processedData.put(key, eq);
+                }
             }
             BIDto.setTotalNum(String.valueOf(totalNumber));
             BIDto.setEquipmentList(eqList);
@@ -259,16 +275,34 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 sumreq.setSizeIds(sizeIds);
             }
         }
-            List<EquipmentListDto> eqList=new ArrayList<>();
-            Integer totalNumber=0;
-            List<InventorySummary> SumResult = inventorySummaryService.getEquipmentInfoList(sumreq);
-            for (InventorySummary summary : SumResult) {
-                EquipmentListDto eq=new EquipmentListDto();
-                BeanPlusUtil.copyProperties(summary,eq);
+        List<EquipmentListDto> eqList = new ArrayList<>();
+        Integer totalNumber = 0;
+
+// 使用Map来追踪已经处理过的数据
+        Map<String, EquipmentListDto> processedData = new HashMap<>();
+
+        List<InventorySummary> SumResult = inventorySummaryService.getEquipmentInfoList(sumreq);
+
+        for (InventorySummary summary : SumResult) {
+            String key = summary.getSizeId() + "-" + summary.getTypeId();
+
+            if (processedData.containsKey(key)) {
+                // 如果已经存在相同的key，更新已有的数据
+                EquipmentListDto existingDto = processedData.get(key);
+                existingDto.setPlanNum(String.valueOf(Integer.parseInt(existingDto.getPlanNum()) + summary.getStockNumber()));
+                totalNumber += summary.getStockNumber();
+            } else {
+                // 如果是新的key，创建新的EquipmentListDto并添加到eqList中
+                EquipmentListDto eq = new EquipmentListDto();
+                BeanPlusUtil.copyProperties(summary, eq);
                 eq.setPlanNum(String.valueOf(summary.getStockNumber()));
-                totalNumber+=summary.getStockNumber();
+                totalNumber += summary.getStockNumber();
                 eqList.add(eq);
+
+                // 将新的数据放入Map中
+                processedData.put(key, eq);
             }
+        }
             BIDto.setTotalNum(String.valueOf(totalNumber));
             BIDto.setEquipmentList(eqList);
             return  BIDto;