From 9f7d850f985cbd1756798329b9a3669dae51ac48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 18 八月 2025 17:23:55 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 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 78c19c9..a0af4cd 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
@@ -145,7 +145,6 @@
if (0 == availableAgvCount) {
return;
}
-
List<String> staPreNos = getStaPrefixes(staGroupList);
String staTaskMemo = "DEMO_STA_" + String.join("-", staPreNos);
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, 33).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
@@ -172,11 +171,7 @@
}
// 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);
+ 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;
@@ -228,9 +223,7 @@
// 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);
+ .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;
@@ -282,11 +275,7 @@
int maxCapacity = agvModel.getBackpack();
// STA IDLE
- 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);
+ 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)) {
return;
@@ -339,9 +328,7 @@
// STA IDLE
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);
+ .eq(Sta::getStatus, StatusType.ENABLE.val).eq(Sta::getOutEnable, "Y").in(Sta::getStaNo, staGroupList);
List<Sta> idleList = staService.list(idleWrapper);
if (Cools.isEmpty(idleList)) {
return;
@@ -391,10 +378,7 @@
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)
- )) {
+ if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()).in(Bus::getMemo, memo, staTaskMemo))) {
return;
}
--
Gitblit v1.9.1