From 8c5ce72e1334c972238578b8e21e6b698a68a457 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 18:55:31 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 07c5c74..579a71d 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -228,7 +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)) {
@@ -266,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", 3).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())) {
--
Gitblit v1.9.1