From 719802b3b9d11e1de7bbce5a233ebbab95f43c1f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Thu, 15 May 2025 08:26:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=95=B4=E7=90=86=E5=A4=A7=E7=9B=92?= =?UTF-8?q?=E5=AD=90=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/wms/controller/TaskController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java index 79d7310..6cbe45e 100644 --- a/src/main/java/com/wms/controller/TaskController.java +++ b/src/main/java/com/wms/controller/TaskController.java @@ -2770,7 +2770,14 @@ public class TaskController { } // 查询到这些工单的dbs Map orderedOrdersIdsMap = kateDBSList.stream().collect(Collectors.toMap(KateDBS::getWorkOrder, KateDBS::getWorkSequence)); - List orderedOrdersIds = orderedOrdersIdsMap.keySet().stream().sorted(Comparator.comparingInt(orderedOrdersIdsMap::get)).toList(); + List orderedOrdersIds; + if (Objects.equals(currentBigBoxConfig.getModel(), "MWL")) { + // 装载机正序排序 + orderedOrdersIds = orderedOrdersIdsMap.entrySet().stream().sorted(Map.Entry.comparingByValue()).map(Map.Entry::getKey).toList(); + } else { + // 平地机倒序排序 + orderedOrdersIds = orderedOrdersIdsMap.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).map(Map.Entry::getKey).toList(); + } List toBeLightedOrders = orderedOrdersIds.stream().skip((long) (sortBoxRequest.getOrderOfOrders() - 1) * orderQuantity).limit(orderQuantity).toList(); // 生成亮灯数据 if (!toBeLightedOrders.isEmpty()) {