From f6d7715faac84e0a550353d8b4dcac2693c30d51 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 15:29:19 +0800
Subject: [PATCH] #优先级
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 2639d03..19720c1 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -40,7 +40,8 @@
.isNotNull("loc_type")
.ne("loc_type", "")
.eq("floor", 1)
- .eq("loc_sts","F"));
+ .eq("loc_sts","F")
+ .orderBy("io_pri",false));
if (agvLocMasts.isEmpty()) {
return;
}
@@ -63,7 +64,7 @@
.andNew().eq("io_type",108)
.andNew()
.eq("crn_no",2).or().eq("crn_no",3)
- .orderBy("appe_time",true)
+ .orderBy("io_pri",false).orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
return;
@@ -159,7 +160,8 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 214)
.eq("loc_no","")
- .eq("io_type",113));
+ .eq("io_type",113)
+ .orderBy("io_pri",false));
if (agvWrkMastList.isEmpty()) {
return;
}
@@ -208,7 +210,8 @@
new EntityWrapper<AgvLocMast>()
.ne("floor", 1)
.eq("loc_sts","D")
- .eq("loc_type1",3));
+ .eq("loc_type1",3)
+ .orderBy("io_pri",false));
if (agvLocMasts.isEmpty()) {
return;
}
@@ -251,7 +254,8 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.ne("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB"));
+ .like("dev_no", "DB")
+ .orderBy("io_pri",false));
if (agvBasDevps.isEmpty()) {
return;
}
@@ -273,7 +277,8 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.eq("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB"));
+ .like("dev_no", "DB")
+ .orderBy("io_pri",false));
if (agvBasDevps.isEmpty()) {
return;
}
--
Gitblit v1.9.1