status状态页面显示每种库位的容量

src/main/java/com/neotel/smfcore/custom/micron1053/bean/dto/MicronEquipStatusDto.java

@@ -22,4 +22,6 @@ public class MicronEquipStatusDto implements Serializable {
 
 
     @ApiModelProperty("消息列表")
     @ApiModelProperty("消息列表")
     private List<EquipMsgDto> msgList=new ArrayList<>();
     private List<EquipMsgDto> msgList=new ArrayList<>();
+    @ApiModelProperty("库存列表")
+    private Map<String,PosUsageItem> usageItemMap=null;
 }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/bean/dto/PosUsageItem.java

+package com.neotel.smfcore.custom.micron1053.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PosUsageItem {
+
+//    pizza box: used/not used(数据参考库存界面，已用/未用)
+//    reel: used/not used
+//    tray:used/not used
+//    pcb:used/not used
+    @ApiModelProperty("库位名称：")
+    private String sizeName;
+
+
+    @ApiModelProperty("使用仓位数")
+    private int usedCount;
+
+
+    @ApiModelProperty("总仓位数")
+    private int totalCount;
+}

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronStatusController.java

@@ -164,7 +164,27 @@ public class MicronStatusController {
             dto.getMsgList().add(dtoMsg);
             dto.getMsgList().add(dtoMsg);
 //             }
 //             }
         }
         }
+        Map<String,PosUsageItem> items=new HashMap<>();
+        Map<String, Storage> allPosLists =dataCache.getAllStorage();
+        for (Storage storage :
+                allPosLists.values()) {
 
 
+            Map<String, UsageItem> itemMap=  storage.getUsageMap();
+            for (UsageItem item :
+                    itemMap.values()) {
+                String type=MicronDataCache.GetMaterialType(storage.getCid(), storage.getId(),item.getW(),item.getH());
+                PosUsageItem posUsageItem=items.getOrDefault(type,null  );
+                if(posUsageItem==null){
+                    posUsageItem=new PosUsageItem(type,item.getUsedCount(),item.getTotalCount()) ;
+                }
+                else{
+                    posUsageItem.setTotalCount(posUsageItem.getTotalCount()+item.getTotalCount());
+                    posUsageItem.setUsedCount(posUsageItem.getUsedCount()+item.getUsedCount());
+                }
+                items.put(type,posUsageItem);
+            }
+        }
+        dto.setUsageItemMap(items);
         return dto;
         return dto;
     }
     }