diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java index 24599213..4193810b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java @@ -124,8 +124,10 @@ public class AppLocationServiceImpl implements IAppLocationService { AppLocation resultLocation = null; // 可用库位列表 List availableLocationList = appLocationList.stream().filter(item -> - item.getIsWorking() == 0 && item.getIsLock() == 0 && item.getLocationStatus() == 0).sorted(Comparator - .comparingInt(AppLocation::getwCol).thenComparingInt(AppLocation::getwLayer).thenComparingInt(AppLocation::getwDepth)).collect(Collectors.toList()); + item.getIsWorking() == 0 && item.getIsLock() == 0 && item.getLocationStatus() == 0) + .sorted(Comparator.comparingInt(AppLocation::getwDepth).reversed()) + .sorted(Comparator.comparingInt(location -> location.getwCol() + location.getwLayer())) + .collect(Collectors.toList()); // 排序 for (AppLocation appLocation : availableLocationList) { if (appLocation.getIsWorking() == 1 || appLocation.getIsLock() == 1 || appLocation.getLocationStatus() == 1) {