From c28c70ac1507df7a9e17e97474fd7d2c368fc673 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:22:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 19720c1..5c9af68 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -40,8 +40,7 @@
.isNotNull("loc_type")
.ne("loc_type", "")
.eq("floor", 1)
- .eq("loc_sts","F")
- .orderBy("io_pri",false));
+ .eq("loc_sts","F"));
if (agvLocMasts.isEmpty()) {
return;
}
@@ -204,25 +203,22 @@
*/
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack4(){
-// if (determineFloorConnection(2)){
- // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
- new EntityWrapper<AgvLocMast>()
- .ne("floor", 1)
- .eq("loc_sts","D")
- .eq("loc_type1",3)
- .orderBy("io_pri",false));
- if (agvLocMasts.isEmpty()) {
- return;
+ // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
+ new EntityWrapper<AgvLocMast>()
+ .ne("floor", 1)
+ .eq("loc_sts","D")
+ .eq("loc_type1",3));
+ if (agvLocMasts.isEmpty()) {
+ return;
+ }
+ for (AgvLocMast agvLocMast : agvLocMasts) {
+ try{
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
- for (AgvLocMast agvLocMast : agvLocMasts) {
- try{
- autoMoveHandler.autoEmptyBack4(agvLocMast);
- } catch (Exception e){
- log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
- }
- }
-// }
+ }
}
private boolean determineFloorConnection(Integer floor){
@@ -254,8 +250,7 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.ne("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB")
- .orderBy("io_pri",false));
+ .like("dev_no", "DB"));
if (agvBasDevps.isEmpty()) {
return;
}
@@ -277,8 +272,7 @@
List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>()
.eq("floor", 1)
.eq("loc_sts", "F")
- .like("dev_no", "DB")
- .orderBy("io_pri",false));
+ .like("dev_no", "DB"));
if (agvBasDevps.isEmpty()) {
return;
}
--
Gitblit v1.9.1