From 11c50b4816162753dd40ce5f501487d939196f69 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 21 十一月 2025 15:52:17 +0800
Subject: [PATCH] 跑库逻辑调整
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 8 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 c6081b3..fc85f78 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
@@ -85,7 +85,7 @@
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);
+ this.autoRun2(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
break;
default:
break;
@@ -111,9 +111,9 @@
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;
+// case '5':
+// this.autoOut(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, StaGroupConstant.FAR_LEFT_STA_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+// break;
default:
break;
}
@@ -138,6 +138,19 @@
// 绉诲簱
this.runLocToLoc(locGroupList, agvGroupList, staTaskMemo);
+ }
+
+ private void autoRun2(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.runLocToLoc2(locGroupList, agvGroupList, staTaskMemo);
}
private void autoOut(List<Integer> locGroupList, List<String> staGroupList, List<String> agvGroupList) {
@@ -203,7 +216,7 @@
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setPriority(100);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
-
+ taskDto.setMemo(memo);
param.getTaskList().add(taskDto);
}
@@ -255,7 +268,7 @@
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setPriority(99);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
-
+ taskDto.setMemo(memo);
param.getTaskList().add(taskDto);
num--;
}
@@ -307,7 +320,7 @@
taskDto.setDestSta(idleSta.getStaNo());
taskDto.setPriority(100);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
-
+ taskDto.setMemo(memo);
param.getTaskList().add(taskDto);
}
@@ -359,6 +372,7 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestSta(idleSta.getStaNo());
taskDto.setPriority(100);
+ taskDto.setMemo(memo);
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
param.getTaskList().add(taskDto);
@@ -376,6 +390,77 @@
String memo = "DEMO_LOC_" + startRow + "-" + endRow;
int availableAgvCount = this.getAvailableAgvCount(agvGroupList);
+
+ // 鏈�澶� ? 缁刡us杩愯
+// if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().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();
+
+ Integer maxTask = configService.getVal("maxTask", Integer.class, 30);
+ // 鏈�澶� ? 涓换鍔¤繍琛�
+ if (maxTask <= taskService.count(new LambdaQueryWrapper<Task>().in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()).in(Task::getMemo, memo, staTaskMemo))) {
+ return;
+ }
+
+ // STOCK
+ LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
+ if (null != startRow) {
+ stockWrapper.ge(Loc::getRow, startRow);
+ }
+ if (null != endRow) {
+ stockWrapper.le(Loc::getRow, endRow);
+ }
+ List<Loc> stockList = locService.list(stockWrapper);
+ if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+ return;
+ }
+ Collections.shuffle(stockList);
+
+ // IDLE
+ LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
+ if (null != startRow) {
+ idleWrapper.ge(Loc::getRow, startRow);
+ }
+ if (null != endRow) {
+ idleWrapper.le(Loc::getRow, endRow);
+ }
+ List<Loc> idleList = locService.list(idleWrapper);
+ if (Cools.isEmpty(idleList)) {
+ return;
+ }
+ Collections.shuffle(idleList);
+
+ OpenBusSubmitParam param = new OpenBusSubmitParam();
+ param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
+ for (int i = 0; i < Math.min(maxCapacity, Math.min(stockList.size(), idleList.size())); i++) {
+ Loc stockLoc = stockList.get(i);
+ Loc idleLoc = idleList.get(i);
+
+ TaskDto taskDto = new TaskDto();
+ taskDto.setOriLoc(stockLoc.getLocNo());
+ taskDto.setDestLoc(idleLoc.getLocNo());
+ taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
+ taskDto.setMemo(memo);
+ param.getTaskList().add(taskDto);
+ }
+
+ mainService.generateBusAndTask(param, memo);
+ }
+
+ private void runLocToLoc2(List<Integer> locGroupList, List<String> agvGroupList, String staTaskMemo) {
+ Integer startRow = Collections.min(locGroupList);
+ Integer endRow = Collections.max(locGroupList);
+
+ String memo = "DEMO_LOC_" + startRow + "-" + endRow;
+
+ // -2 鏄负浜嗘湇鍔¤緭閫佺嚎
+ int availableAgvCount = this.getAvailableAgvCount(agvGroupList) - 1;
// 鏈�澶� ? 缁刡us杩愯
if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()).in(Bus::getMemo, memo, staTaskMemo))) {
@@ -426,7 +511,7 @@
taskDto.setOriLoc(stockLoc.getLocNo());
taskDto.setDestLoc(idleLoc.getLocNo());
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(11, 19));
-
+ taskDto.setMemo(memo);
param.getTaskList().add(taskDto);
}
--
Gitblit v1.9.1