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 | 23 +++++++++++++++--------
1 files changed, 15 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 a63b102..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
@@ -216,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);
}
@@ -268,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--;
}
@@ -320,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);
}
@@ -372,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);
@@ -391,15 +392,21 @@
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;
- }
+// 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());
@@ -439,7 +446,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);
}
@@ -504,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