From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index b217b39..f2cc9ea 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -62,7 +62,6 @@
private void patrolOfMove(String agvNo) {
Long agvId = agvService.getAgvId(agvNo);
- AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
.eq(Travel::getAgvId, agvId)
.eq(Travel::getState, TravelStateType.RUNNING.toString()))) {
@@ -77,13 +76,13 @@
if (!agvService.judgeEnable(agvId)) {
return;
}
- Agv agv = agvService.getById(agvId);
- Code destinationCode = this.getDestinationCode(agv, agvDetail);
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
+ Code destinationCode = this.getDestinationCode(agvNo, agvDetail);
if (null == destinationCode) {
return;
}
- if (mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, destinationCode.getData(), null)) {
- log.info(agv.getUuid() + "寮�濮嬭蛋琛屾紨绀�...");
+ if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCode.getData(), null)) {
+ log.info(agvNo + "寮�濮嬭蛋琛屾紨绀�...");
}
}
@@ -98,7 +97,7 @@
* 璇勪及HandlerController娌℃湁璋冪敤buildMajorTask锛屾墜鍔ㄥ垱寤簍ask鐨勫彲琛屾��
* agv鍦板浘鍥炬爣鍙樺寲
*/
- public Code getDestinationCode(Agv agv, AgvDetail agvDetail) {
+ public Code getDestinationCode(String agvNo, AgvDetail agvDetail) {
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
Code startCode = codeService.getById(agvDetail.getRecentCode());
@@ -128,7 +127,7 @@
for (Code endCode : list) {
// valid lane
- if (!allocateService.validCapacityOfLane(agv, endCode)) {
+ if (!allocateService.validCapacityOfLane(agvNo, endCode)) {
continue;
}
--
Gitblit v1.9.1