1. 整理大盒子顺序修正

This commit is contained in:
梁州 2025-05-15 08:26:03 +08:00
parent 2bea28b5a0
commit 719802b3b9

View File

@ -2770,7 +2770,14 @@ public class TaskController {
}
// 查询到这些工单的dbs
Map<String, Integer> orderedOrdersIdsMap = kateDBSList.stream().collect(Collectors.toMap(KateDBS::getWorkOrder, KateDBS::getWorkSequence));
List<String> orderedOrdersIds = orderedOrdersIdsMap.keySet().stream().sorted(Comparator.comparingInt(orderedOrdersIdsMap::get)).toList();
List<String> 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<String> toBeLightedOrders = orderedOrdersIds.stream().skip((long) (sortBoxRequest.getOrderOfOrders() - 1) * orderQuantity).limit(orderQuantity).toList();
// 生成亮灯数据
if (!toBeLightedOrders.isEmpty()) {