From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 19 十一月 2024 10:03:17 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/common/service/AgvCommonService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java index 8efe2b6..e7aded0 100644 --- a/src/main/java/com/zy/common/service/AgvCommonService.java +++ b/src/main/java/com/zy/common/service/AgvCommonService.java @@ -238,7 +238,10 @@ Boolean orderBy = false; int levCount = 0; int times = 1; - if (floor == 1) { + if (floor == 1 || floor >= 4) { + if (floor >= 4 ) { + floor = 1; + } orderBy = true; levCount = 2; } else { @@ -253,7 +256,11 @@ if (isEmpty) { wrapper.eq("floor", floor).eq("lev1",1); } else { - wrapper.eq("floor", floor).orderBy("lev1",!orderBy); + if (isCurrLev) { + wrapper.eq("floor", floor).eq("lev1",1); + } else { + wrapper.eq("floor", floor).orderBy("lev1",!orderBy); + } } -- Gitblit v1.9.1