From 14f2c4fce50c871d84f89d2dca2298e0892b4672 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 08:25:26 +0800
Subject: [PATCH] Merge branch 'rcs_master_1.0' into rcs_master_all
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
index 58e5b20..ad17d45 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/test/AutoRunScheduler.java
@@ -20,12 +20,13 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
-//@Component
+@Component
public class AutoRunScheduler {
private static final AgvModelType DEFAULT_AGV_MODEL = AgvModelType.CTU_BOX_TRANSPORT_AGV;
@@ -81,8 +82,7 @@
private void autoRun(AgvModel agvModel) {
- List<String> staPreNos = new ArrayList<>();
- String memo = "DEMO_STA_" + String.join("-", staPreNos);
+ String memo = "TEST" ;
String taskAssignModeArea = configService.getVal("TaskAssignModeArea", String.class);
if (Cools.isEmpty(taskAssignModeArea)) {
return;
@@ -94,20 +94,20 @@
}
List<Area> list = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getName, areaCode));
Optional<Integer> max = list.stream().map(Area::getPriority).filter(Objects::nonNull).max(Integer::compareTo);
- Integer priority = max.isPresent() ? max.get() : null;
- if (!Cools.isEmpty(priority)) {
+ Integer priority = max.orElse(null);
+ if (Cools.isEmpty(priority) || priority == 0) {
// 鍏ュ簱
this.runStaToLoc(agvModel, testAreaCodes, memo);
// 鍑哄簱
this.runLocToSta(agvModel, testAreaCodes, memo);
// 绉诲簱
this.runLocToLoc(areaCode, agvModel, testAreaCodes, memo);
- } else if (priority > 10) {
+ } else if (priority > 0 && priority < 10) {
// 鍑哄簱
this.runLocToSta(agvModel, testAreaCodes, memo);
// 绉诲簱
this.runLocToLoc(areaCode, agvModel, testAreaCodes, memo);
- } else if (priority > 100) {
+ } else {
// 绉诲簱
this.runLocToLoc(areaCode, agvModel, testAreaCodes, memo);
}
@@ -149,7 +149,7 @@
TaskDto taskDto = new TaskDto();
taskDto.setOriSta(stockSta.getStaNo());
taskDto.setDestLoc(idleLoc.getLocNo());
- taskDto.setPriority(100);
+ taskDto.setPriority(9999);
taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
param.getTasks().add(taskDto);
@@ -195,7 +195,7 @@
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestSta(idleSta.getStaNo());
- taskDto.setPriority(100);
+ taskDto.setPriority(9999);
taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
param.getTasks().add(taskDto);
@@ -247,7 +247,7 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setTaskNo(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
-
+ taskDto.setPriority(9999);
param.getTasks().add(taskDto);
}
if (Cools.isEmpty(param.getTasks())) {
--
Gitblit v1.9.1