From cd67e854d4715bc92a16dc7bffdbde7be1da9957 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 27 三月 2025 13:02:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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..4ef5050 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,8 @@
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.AgvGroupConstant;
+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,29 +219,46 @@
}
}
-
-
// auto loc to loc ----------------------------------------------------------------------------------------------
@Scheduled(cron = "0/1 * * * * ? ")
private void autoLocToLoc() {
if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
- // 鏈�澶氫袱缁刡us杩愯
-// if (1 < busService.count(new LambdaQueryWrapper<Bus>().in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val()))) {
-// return;
-// }
+ this.runLocToLoc(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST, AgvGroupConstant.FIRST_AGV_GROUP);
+ this.runLocToLoc(LocGroupConstant.LEFT_LOC_ROW_LIST, AgvGroupConstant.SECOND_AGV_GROUP);
+ this.runLocToLoc(LocGroupConstant.MIDDLE_LOC_ROW_LIST, AgvGroupConstant.THIRD_AGV_GROUP);
+ this.runLocToLoc(LocGroupConstant.RIGHT_LOC_ROW_LIST, AgvGroupConstant.FOURTH_AGV_GROUP);
+ this.runLocToLoc(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST, AgvGroupConstant.FIFTH_AGV_GROUP);
+ }
-// int agvCount = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ private void runLocToLoc(List<Integer> locGroupList, List<String> agvGroupList) {
+ Integer startRow = Collections.min(locGroupList);
+ Integer endRow = Collections.max(locGroupList);
+
+ String memo = "DEMO_" + startRow + "-" + endRow;
+
+ int agvCount = agvGroupList.size();
+
+ // 鏈�澶� ? 缁刡us杩愯
+ if (agvCount <= busService.count(new LambdaQueryWrapper<Bus>()
+ .in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
+ .eq(Bus::getMemo, memo)
+ )) {
+ 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() * agvCount;
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 +269,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,10 +293,9 @@
taskDto.setSeqNum(String.valueOf(snowflakeIdWorker.nextId()).substring(15, 19));
param.getTaskList().add(taskDto);
-
}
- mainService.generateBusAndTask(param, "autoLocToLoc");
+ mainService.generateBusAndTask(param, memo);
}
}
--
Gitblit v1.9.1