From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
index d37a3c6..cbd0707 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -24,6 +24,8 @@
@Component
public class AutoRunScheduler {
+ private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
+
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@Autowired
@@ -52,10 +54,13 @@
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
- this.autoRun();
+ AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, DEFAULT_AGV_MODEL.toString()));
+ if (null == agvModel) { return; }
+
+ this.autoRun(agvModel);
}
- private void autoRun() {
+ private void autoRun(AgvModel agvModel) {
int availableAgvCount = this.getAvailableAgvCount();
if (0 == availableAgvCount) { return; }
@@ -64,18 +69,16 @@
String memo = "DEMO_STA_" + String.join("-", staPreNos);
// 鍏ュ簱
- this.runStaToLoc(memo);
+ this.runStaToLoc(agvModel, memo);
// 鍑哄簱
- this.runLocToSta(memo);
-
+ this.runLocToSta(agvModel, memo);
// 绉诲簱
- this.runLocToLoc(memo);
+ this.runLocToLoc(agvModel, memo);
}
// 鍏ュ簱
- private void runStaToLoc(String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
+ private void runStaToLoc(AgvModel agvModel, String memo) {
+
// STOCK STA
List<Sta> stockList = staService.queryAvailableOutSta(1);
@@ -131,9 +134,7 @@
}
// 鍑哄簱
- private void runLocToSta(String memo) {
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
+ private void runLocToSta(AgvModel agvModel, String memo) {
// IDLE STA
List<Sta> idleList = staService.queryAvailableInSta(1);
@@ -189,7 +190,7 @@
}
// 绉诲簱
- private void runLocToLoc(String staTaskMemo) {
+ private void runLocToLoc(AgvModel agvModel, String staTaskMemo) {
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -199,9 +200,6 @@
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
.in(Bus::getMemo, memo, staTaskMemo)
)) { return; }
-
- AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) { return; }
int maxCapacity = agvModel.getBackpack();
--
Gitblit v1.9.1