From 469d8ceb95ed82f09fd4c1bddbbe672689bc8d82 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 19:52:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index a740a65..e370d60 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -228,6 +228,7 @@
boolean flag = false;
if (config != null && !Cools.isEmpty(config.getValue())) {
try {
+
// 鍒ゆ柇鏄惁鍦ㄦ墽琛屾椂闂村唴
ProcesTimeData procesTimeData = JSONObject.parseObject(config.getValue(), ProcesTimeData.class);
if (procesTimeData != null && config.getStatus() == 1 && TimeUtils.between(procesTimeData)) {
@@ -242,14 +243,14 @@
try {
autoMoveHandler.autoEmptyBack4(agvLocMast);
} catch (Exception e) {
- log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ //log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
}
}
} else {
try {
autoMoveHandler.autoEmptyBack4(agvLocMast);
} catch (Exception e) {
- log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ //log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
}
}
@@ -265,6 +266,22 @@
// TODO 鍥涙湡
@Scheduled(cron = "0/30 * * * * ? ")
private void autoEmptyBackSiqi() {
+ Config config2 = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_EMPTY"));
+ //鍏堝垽鏂┖搴撲綅鏁颁簡
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_type1", 6).eq("floor", 1).eq("lev1", 2).eq("loc_sts", "O"));
+ int size = 0;
+ if (agvLocMasts != null) {
+ size = agvLocMasts.size();
+ }
+ if (config2 != null && config2.getStatus() == 1 && !Cools.isEmpty(config2.getValue())) {
+ if (size < Integer.parseInt(config2.getValue())) {
+ return;
+ }
+ } else {
+ if (size < 20) {
+ return;
+ }
+ }
// 鏌ヨ6绫诲瀷绌鸿揣鏋惰繑鍥炵殑鎵ц鏃堕棿鐐�
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_TIME"));
if (config != null && !Cools.isEmpty(config.getValue())) {
@@ -291,7 +308,7 @@
private void executeLocType6() {
// 鏌ヨ 浜屽巶鐨勭殑鍗婃垚鍝佺澹崇被鍨嬬殑绌鸿揣鏋�
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).eq("floor", 2));
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_sts", "D").eq("loc_type1", 6).eq("floor", 2).orderBy("bay1",false));
if (agvLocMasts.isEmpty()) {
return;
}
--
Gitblit v1.9.1