From de1a78dd2f4cfdb6663a1134083dd74f750faae5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index a5825d4..6b30542 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -76,8 +76,8 @@
}
- // 绌烘澘鑷姩鍥炲簱
- @Scheduled(cron = "0/2 * * * * ? ")
+ // 绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack(){
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
@@ -91,6 +91,39 @@
for (AgvLocMast agvLocMast : agvLocMasts) {
ReturnT<String> returnT = autoMoveHandler.autoEmptyBack(agvLocMast);
}
+ }
+ // 绌烘澘鑷姩鍥炲簱 鎺ラ┏鐐� - 1妤煎簱浣�
+ //@Scheduled(cron = "0/2 * * * * ? ")
+ private void autoEmptyBack3(){
+ // 宸ヤ綔妗ｄ负201 涓� 鍏ュ嚭搴撶被鍨嬩负109
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 201)
+ .eq("loc_no","")
+ .eq("io_type",109)
+ .or().eq("io_type",112));
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ ReturnT<String> returnT = autoMoveHandler.autoEmptyBack3(agvWrkMast);
+ }
+ }
+
+ // 绌烘澘鑷姩鍥炲簱
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void autoEmptyBack2(){
+ // 鏌ヨ 涓嶄负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) {
+ ReturnT<String> returnT = autoMoveHandler.autoEmptyBack2(agvLocMast);
+ }
}
}
--
Gitblit v1.9.1