1.页面增加尺寸排序

src/main/java/com/neotel/smfcore/core/dashboard/mimo/SmdBoxMimoController.java

@@ -18,6 +18,7 @@ import com.neotel.smfcore.core.dashboard.bean.dto.first.InOutDataDto;
 import com.neotel.smfcore.core.inout.service.manager.IInOutDataManager;
 import com.neotel.smfcore.core.inout.service.manager.IInOutDataManager;
 import com.neotel.smfcore.core.inout.service.po.InOutData;
 import com.neotel.smfcore.core.inout.service.po.InOutData;
 import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
 import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
+import com.neotel.smfcore.core.kanban.rest.utils.NaturalOrderComparator;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.message.rest.bean.dto.MessageDto;
 import com.neotel.smfcore.core.message.rest.bean.dto.MessageDto;
 import com.neotel.smfcore.core.message.rest.bean.mapstruct.MessageMapper;
 import com.neotel.smfcore.core.message.rest.bean.mapstruct.MessageMapper;
@@ -105,7 +106,18 @@ public class SmdBoxMimoController {
                         posCount += item.getTotalCount();
                         posCount += item.getTotalCount();
                         usePosCount += item.getUsedCount();
                         usePosCount += item.getUsedCount();
                     }
                     }
-                    InventoryBoxDto boxDto = new InventoryBoxDto(storage.getId(), storage.getName(), storage.getCid(), storage.getType(), storage.getUsageMap(), posCount, usePosCount);
+
+                    Map<String, UsageItem> sortUsageMap = new LinkedHashMap<>();
+                    Map<String, UsageItem> usageMap = storage.getUsageMap();
+                    if (usageMap != null && !usageMap.isEmpty()) {
+                        List<UsageItem> usageList = new ArrayList<>(usageMap.values());
+                        usageList = usageList.stream().sorted(Comparator.comparing(UsageItem :: getW).thenComparing(UsageItem :: getH)).collect(Collectors.toList());
+                        for (UsageItem usageItem : usageList) {
+                            sortUsageMap.put(usageItem.getSizeStr(),usageItem);
+                        }
+                    }
+
+                    InventoryBoxDto boxDto = new InventoryBoxDto(storage.getId(), storage.getName(), storage.getCid(), storage.getType(), sortUsageMap, posCount, usePosCount);
                     boxDtos.add(boxDto);
                     boxDtos.add(boxDto);
                 }
                 }
                 if (boxDtos.size() > 0) {
                 if (boxDtos.size() > 0) {