From 0379bbe120f509f8c330713958b59687d25b80b3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 08 二月 2025 16:34:50 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 10 ++++++----
1 files changed, 6 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 c6d9042..e8f5d8c 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -218,7 +218,9 @@
// 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
// TODO 鍥涙湡
- .eq("loc_sts", "D").eq("loc_type1", 3).ne("floor", 1).ne("lev1", 1));
+ .eq("loc_sts", "D").eq("loc_type1", 3)
+ .andNew()
+ .ne("floor", 1).or().ne("lev1", 1));
if (agvLocMasts.isEmpty()) {
return;
}
@@ -335,7 +337,7 @@
}
/**
- * 鑷姩绉诲簱
+ * 璺ㄥ眰鑷姩绉诲簱
*/
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack7() throws ParseException {
@@ -382,7 +384,7 @@
/**
- * 鑷姩绉诲簱锛屽洓鏈�
+ * 鎵撴爣璁扮殑搴撲綅杩涜鑷姩绉诲簱锛屽洓鏈�
* 鍦ㄥ簱浣嶄笉澶熺殑鎯呭喌涓嬶紝绠卞３鍏ュ簱鍒殑妤煎眰搴撲綅鐨勬椂鍊欙紝鏅氫笂杩涜璺ㄥ眰绉诲簱
*/
@Scheduled(cron = "0/2 * * * * ? ")
@@ -406,7 +408,7 @@
long time3 = time - time1;
- if (time3 > 0 && time3 < (1000 * 60 * 10)) {
+ if (time3 > 0) {
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 12));
if (agvWrkMasts != null && maxTansk <= agvWrkMasts.size()) {
--
Gitblit v1.9.1