From e5b15215a032740e7bda86e96720f763b049ce17 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十一月 2024 13:52:00 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 8 +++++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 5 +++--
2 files changed, 8 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 1c683d1..24d04a8 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
@@ -160,6 +160,7 @@
if (null != agvModel) {
maxCapacity = agvModel.getBackpack() * numOfAgv;
}
+ int numOfStockLocList;
// STOCK
List<Loc> stockList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()));
if (Cools.isEmpty(stockList)) {
@@ -169,6 +170,7 @@
if (stockList.size() > maxCapacity) {
stockList = stockList.subList(0, maxCapacity);
}
+ numOfStockLocList = stockList.size();
// IDLE
List<Loc> idleList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val()));
@@ -176,13 +178,13 @@
return;
}
Collections.shuffle(idleList);
- if (idleList.size() > maxCapacity) {
- idleList = idleList.subList(0, maxCapacity);
+ if (idleList.size() > numOfStockLocList) {
+ idleList = idleList.subList(0, numOfStockLocList);
}
OpenBusSubmitParam param = new OpenBusSubmitParam();
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < maxCapacity; i++) {
+ for (int i = 0; i < numOfStockLocList; i++) {
Loc stockLoc = stockList.get(i);
Loc idleLoc = idleList.get(i);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index 4f66dce..d894204 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -13,7 +13,6 @@
import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.SegmentStateType;
-import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.mapper.AgvMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
@@ -159,7 +158,9 @@
@Override
public Agv findByPosition(Long codeId) {
- List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>()
+// .eq(Agv::getStatus, StatusType.ENABLE.val)
+ );
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) {
--
Gitblit v1.9.1