From c4f93ad536f611aa4299354b2d52120cabd8f787 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 26 三月 2025 10:50:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index f594efa..af26b61 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -4,6 +4,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.domain.TaskDto;
+import com.zy.acs.manager.core.constant.LocGroupConstant;
import com.zy.acs.manager.core.domain.AgvTaskDto;
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
@@ -217,14 +218,20 @@
}
}
-
-
// auto loc to loc ----------------------------------------------------------------------------------------------
@Scheduled(cron = "0/1 * * * * ? ")
private void autoLocToLoc() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
+ this.runLocToLoc(Collections.min(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST), Collections.max(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST));
+ this.runLocToLoc(Collections.min(LocGroupConstant.LEFT_LOC_ROW_LIST), Collections.max(LocGroupConstant.LEFT_LOC_ROW_LIST));
+ this.runLocToLoc(Collections.min(LocGroupConstant.MIDDLE_LOC_ROW_LIST), Collections.max(LocGroupConstant.MIDDLE_LOC_ROW_LIST));
+ this.runLocToLoc(Collections.min(LocGroupConstant.RIGHT_LOC_ROW_LIST), Collections.max(LocGroupConstant.RIGHT_LOC_ROW_LIST));
+ this.runLocToLoc(Collections.min(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST), Collections.max(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST));
+ }
+
+ private void runLocToLoc(Integer startRow, Integer endRow) {
// 鏈�澶氫袱缁刡us杩愯
// if (1 < busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()))) {
// return;
@@ -239,7 +246,10 @@
int maxCapacity = agvModel.getBackpack();
// STOCK
- List<Loc> stockList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()));
+ 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;
}
@@ -250,7 +260,10 @@
int numOfStockLocList = stockList.size();
// IDLE
- List<Loc> idleList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val()));
+ 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;
}
@@ -271,7 +284,6 @@
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
param.getTaskList().add(taskDto);
-
}
mainService.generateBusAndTask(param, "autoLocToLoc");
--
Gitblit v1.9.1