1.增加单个库存展示

src/main/java/com/neotel/smfcore/custom/lizhen/report/TowerInventoryController.java

@@ -116,10 +116,15 @@ public class TowerInventoryController {
         headers.add(Arrays.asList("料号"));
         headers.add(Arrays.asList("料号"));
         headers.add(Arrays.asList("替代料分组"));
         headers.add(Arrays.asList("替代料分组"));
         headers.add(Arrays.asList("需求最小库存盘数"));
         headers.add(Arrays.asList("需求最小库存盘数"));
-        //headers.add(Arrays.asList("需求最大库存盘数"));
-        headers.add(Arrays.asList("当前料仓库存"));
-        headers.add(Arrays.asList("104库存"));
-        headers.add(Arrays.asList("总库存"));
+
+        headers.add(Arrays.asList("当前料仓库存(不含替代料)"));
+        headers.add(Arrays.asList("104库存(不含替代料)"));
+        headers.add(Arrays.asList("总库存(不含替代料)"));
+
+        headers.add(Arrays.asList("当前料仓库存(含替代料)"));
+        headers.add(Arrays.asList("104库存(含替代料)"));
+        headers.add(Arrays.asList("总库存(含替代料)"));
+
         headers.add(Arrays.asList("缺料盘数"));
         headers.add(Arrays.asList("缺料盘数"));
         headers.add(Arrays.asList("缺料百分比"));
         headers.add(Arrays.asList("缺料百分比"));
 
 
@@ -152,6 +157,11 @@ public class TowerInventoryController {
             rowData.add(inv.getPartNumber());
             rowData.add(inv.getPartNumber());
             rowData.add(inv.getReplaceGroup());
             rowData.add(inv.getReplaceGroup());
             rowData.add(inv.getMinNeedInventory());
             rowData.add(inv.getMinNeedInventory());
+
+            rowData.add(inv.getSingleCurrentInventory());
+            rowData.add(inv.getSingleInventory104());
+            rowData.add(inv.getSingleTotalInventory());
+
             //rowData.add(inv.getMaxNeedInventory());
             //rowData.add(inv.getMaxNeedInventory());
             rowData.add(inv.getCurrentInventory());
             rowData.add(inv.getCurrentInventory());
             rowData.add(inv.getInventory104());
             rowData.add(inv.getInventory104());
@@ -297,6 +307,16 @@ public class TowerInventoryController {
                     double percentage = (double) shortageDisks / minNeedInventory * 100;
                     double percentage = (double) shortageDisks / minNeedInventory * 100;
                     towerInventory.setShortagePercentage(percentage);
                     towerInventory.setShortagePercentage(percentage);
                 }
                 }
+
+                // 新增：计算单个物料的库存
+                String currentPartNumber = towerInventory.getPartNumber();
+                int singleCount = allPartNumberInventory.getOrDefault(currentPartNumber, 0);
+                int singleCount104 = server104Inventory.getOrDefault(currentPartNumber, 0);
+                int singleTotal = singleCount + singleCount104;
+
+                towerInventory.setSingleCurrentInventory(singleCount);   // 单个物料的当前料仓库存
+                towerInventory.setSingleInventory104(singleCount104);     // 单个物料的104库存
+                towerInventory.setSingleTotalInventory(singleTotal);     // 单个物料的总库存
             }
             }
 
 
             // 按料号排序
             // 按料号排序

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/dto/TowerInventory.java

@@ -29,6 +29,11 @@ public class TowerInventory extends BasePo implements Serializable {
 
 
     private double shortagePercentage; //缺料百分比
     private double shortagePercentage; //缺料百分比
 
 
+    // 新增单个物料库存字段
+    private int singleCurrentInventory;   // 单个物料的当前料仓库存
+    private int singleInventory104;       // 单个物料的104库存
+    private int singleTotalInventory;     // 单个物料的总库存
+
 
 
     @Data
     @Data
     public static class MaxAndMinInventory {
     public static class MaxAndMinInventory {