From 4696a0be1e0235e4a9e5077c3f42e038da8c6809 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 14 八月 2025 16:30:37 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 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 d6f17b9..7e10fa7 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
@@ -57,52 +57,111 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
-
// @Scheduled(fixedRate = 500) // 鍥哄畾棰戠巼鎵ц锛屼笉鍚屾
@Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
- if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
-
- this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
- this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
- this.autoRun(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
- this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
- this.autoRun(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ if (configService.getVal("TaskAssignMode", Boolean.class)) {
+ String autoRunAreas = configService.getVal("autoRunAreas", String.class);
+ if (Cools.isEmpty(autoRunAreas)) { return; }
+ for (char c : autoRunAreas.toCharArray()) {
+ switch (c) {
+ case '1':
+ this.autoRun(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ break;
+ case '2':
+ this.autoRun(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
+ break;
+ case '3':
+ this.autoRun(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
+ break;
+ case '4':
+ this.autoRun(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
+ break;
+ case '5':
+ this.autoRun(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+ break;
+ default:
+ break;
+ }
+ }
+ }else {
+ if (configService.getVal("InAndOutMode", Boolean.class,false)) {
+ String autoRunAreas = configService.getVal("autoRunAreas", String.class);
+ if (Cools.isEmpty(autoRunAreas)) { return; }
+ for (char c : autoRunAreas.toCharArray()) {
+ switch (c) {
+ case '1':
+ this.autoOut(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, StaGroupConstant.FAR_RIGHT_STA_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ break;
+ case '2':
+ this.autoOut(LocGroupConstant.RIGHT_LOC_ROW_LIST, StaGroupConstant.RIGHT_STA_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
+ break;
+ case '3':
+ this.autoOut(LocGroupConstant.MIDDLE_LOC_ROW_LIST, StaGroupConstant.MIDDLE_STA_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
+ break;
+ case '4':
+ this.autoOut(LocGroupConstant.LEFT_LOC_ROW_LIST, StaGroupConstant.LEFT_STA_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
+ break;
+ case '5':
+ this.autoOut(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
}
private void autoRun(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
if (0 == availableAgvCount) { return; }
- // 鍏ュ簱
- this.runStaToLoc(locGroupList, staGroupList, agvGroupList);
+ List<String> staPreNos = getStaPrefixes(staGroupList);
+ String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos);
+ // 鍏ュ簱
+ this.runStaToLoc(locGroupList, staGroupList, staTaskMemo);
// 鍑哄簱
- this.runLocToSta(locGroupList, staGroupList, agvGroupList);
+ this.runLocToSta(locGroupList, staGroupList, staTaskMemo);
// 绉诲簱
- this.runLocToLoc(locGroupList, agvGroupList);
+ this.runLocToLoc(locGroupList, agvGroupList, staTaskMemo);
+ }
+
+ private void autoOut(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
+ int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+ if (0 == availableAgvCount) { return; }
+
+ List<String> staPreNos = getStaPrefixes(staGroupList);
+ String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos);
+
+ // 鍑哄簱
+ this.runLocToSta(locGroupList, staGroupList, staTaskMemo);
+ // 鍏ュ簱
+ if (staGroupList.contains("1007")){
+ this.runStaToLoc(locGroupList, staGroupList, staTaskMemo);
+ }
}
// 鍏ュ簱
- private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
+ private void runStaToLoc(List<Integer> locGroupList, List<String> staGroupList, String memo) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
- List<String> staPreNos = getStaPrefixes(staGroupList);
- String memo = "DEMO_STA_" + String.join("-", staPreNos);
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) {
- return;
- }
+// if (null == agvModel) {
+// return;
+// }
// STOCK
LambdaQueryWrapper<Sta> stockWrapper = new LambdaQueryWrapper<Sta>()
.eq(Sta::getStaSts, StaStsType.STOCK.val())
.eq(Sta::getStatus, StatusType.ENABLE.val)
+ .eq(Sta::getInEnable,"Y")
.in(Sta::getStaNo, staGroupList);
List<Sta> stockList = staService.list(stockWrapper);
if (Cools.isEmpty(stockList)) { return; }
@@ -135,12 +194,9 @@
}
// 鍑哄簱
- private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
+ private void runLocToSta(List<Integer> locGroupList, List<String> staGroupList, String memo) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
-
- List<String> staPreNos = getStaPrefixes(staGroupList);
- String memo = "DEMO_STA_" + String.join("-", staPreNos);
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
if (null == agvModel) {
@@ -152,6 +208,7 @@
LambdaQueryWrapper<Sta> idleWrapper = new LambdaQueryWrapper<Sta>()
.eq(Sta::getStaSts, StaStsType.IDLE.val())
.eq(Sta::getStatus, StatusType.ENABLE.val)
+ .eq(Sta::getOutEnable,"Y")
.in(Sta::getStaNo, staGroupList);
List<Sta> idleList = staService.list(idleWrapper);
if (Cools.isEmpty(idleList)) {
@@ -188,7 +245,7 @@
}
// 绉诲簱
- private void runLocToLoc(List<Integer> locGroupList, List<String> agvGroupList) {
+ private void runLocToLoc(List<Integer> locGroupList, List<String> agvGroupList, String staTaskMemo) {
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
@@ -199,7 +256,7 @@
// 鏈�澶� ? 缁刡us杩愯
if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
- .eq(Bus::getMemo, memo)
+ .in(Bus::getMemo, memo, staTaskMemo)
)) {
return;
}
--
Gitblit v1.9.1