From 760f94f5aa0a8777ac1fd2351766882f4ff1049f Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 07:46:21 +0800
Subject: [PATCH] # 529
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 3bf8d47..47690fc 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -50,7 +50,26 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
+ .eq("crn_no",2)
+ .orderBy("appe_time",true)
);
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
+ }
+
+ }
+
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void execute5(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 22)
+ .andNew().eq("io_type",108)
+ .eq("crn_no",3)
+ .orderBy("appe_time",true)
+ );
if (agvWrkMastList.isEmpty()) {
return;
}
@@ -77,7 +96,7 @@
}
// 绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -93,13 +112,13 @@
}
}
// 绌烘澘鑷姩鍥炲簱 鎺ラ┏鐐� - 1妤煎簱浣�
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack3(){
// 宸ヤ綔妗ｄ负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 201)
.eq("loc_no","")
- .or().eq("io_type",109)
+ .eq("io_type",109)
.or().eq("io_type",112));
if (agvWrkMastList.isEmpty()) {
return;
@@ -110,7 +129,7 @@
}
// 绌烘澘鑷姩鍥炲簱
- //@Scheduled(cron = "0/2 * * * * ? ")
+ @Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack2(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
--
Gitblit v1.9.1