From 5ae41979b5a6190ab6989942c1ba062071bfc40c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 20:23:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/AgvCommonService.java | 3 ++-
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 2 +-
2 files changed, 3 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 e370d60..66e16bf 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -264,7 +264,7 @@
* 灏嗕簩鍘傜殑6绫诲瀷鐨勭┖璐ф灦璋冩嫧鍥炲惛濉戜簩妤�
*/
// TODO 鍥涙湡
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
private void autoEmptyBackSiqi() {
Config config2 = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_EMPTY"));
//鍏堝垽鏂┖搴撲綅鏁颁簡
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 0f60a40..1b906b2 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -353,14 +353,15 @@
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_sts", "O").eq("loc_type1", type);
wrapper.eq("floor", floor).eq("lev1", lev1).orderBy("bay1", true);
-
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
+
for (AgvLocMast agvLocMast : agvLocMasts) {
AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
if (agvLocMast1.getLocSts().equals("O")) {
return agvLocMast1;
}
}
+
return null;
} catch (Exception e) {
throw new CoolException("鎼滅储搴撲綅鏃讹紝鏈壘鍒板彲鍏ュ簱搴撲綅銆�");
--
Gitblit v1.9.1