From 2bea28b5a0ff486029b360f1bf893a26af4318a5 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Tue, 13 May 2025 17:27:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A4=A7=E7=9B=92=E5=AD=90=E5=80=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wms/controller/TaskController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java index 8ffe026..79d7310 100644 --- a/src/main/java/com/wms/controller/TaskController.java +++ b/src/main/java/com/wms/controller/TaskController.java @@ -2752,9 +2752,16 @@ public class TaskController { // 查找到所有的工单 List orderIds = eConfigLastList.stream().map(ELocationConfigLast::getWorkOrder).distinct().toList(); // 利用DBS对这些工单id进行排序 - List kateDBSList = kateDBSService.list(new LambdaQueryWrapper() - .in(KateDBS::getWorkOrder, orderIds) - .orderByAsc(KateDBS::getWorkSequence)); + LambdaQueryWrapper dbsQueryWrapper = new LambdaQueryWrapper() + .in(KateDBS::getWorkOrder, orderIds); + if (Objects.equals(currentBigBoxConfig.getModel(), "MWL")) { + // 装载机正序排序 + dbsQueryWrapper.orderByAsc(KateDBS::getWorkSequence); + } else { + // 平地机倒序排序 + dbsQueryWrapper.orderByDesc(KateDBS::getWorkSequence); + } + List kateDBSList = kateDBSService.list(dbsQueryWrapper); if (kateDBSList == null || kateDBSList.isEmpty()) { logger.error("DBS查询错误,请检查DBS清单数据。"); response.setCode(ResponseCode.ERROR.getCode());