From 35da3ccc177f243a6d2257ae924b305ff1854095 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 20 一月 2025 14:51:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 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 a3c29b9..cf52343 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
@@ -91,26 +91,17 @@
return;
}
-// // 宸蹭娇鐢ㄨ儗绡撴暟閲�
-// Integer usedSlots = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
-// if (null == usedSlots) {
-// return;
-// }
-// AgvModel agvModel = agvModelService.getByAgvId(agvId);
-// // 鑳岀瘬绌洪棽鏁�
-// int remainingBackpack = Math.max(agvModel.getBackpack() - usedSlots, 0);
-
-
- String destinationCodeData = null;
-
JobType jobType = this.agvJobMap.get(agvNo);
if (null == jobType) {
this.agvJobMap.put(agvNo, JobType.LOC_PICK);
CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, 0);
jobType = JobType.LOC_PICK;
}
+
+ String destinationCodeData = null;
switch (jobType) {
case LOC_PICK:
+ // 5, 4, 3, 2, 1
int locPickRemaining = agvService.getBackpackRemainingCapacity(agvId);
if (0 < locPickRemaining) {
destinationCodeData = this.getLocCode(agvNo, null);
@@ -123,8 +114,9 @@
destinationCodeData = this.getConveyorPickCode(agvNo);
break;
case LOCK_DROP:
+ // 0, 1, 2, 3, 4
int locDropRemaining = agvService.getBackpackRemainingCapacity(agvId);
- if (0 < locDropRemaining) {
+ if (locDropRemaining < agvModelService.getByAgvId(agvId).getBackpack()) {
destinationCodeData = this.getLocCode(agvNo, null);
}
break;
@@ -132,14 +124,12 @@
log.warn("AGV {}: 鏈煡闃舵: {}", agvNo, jobType);
break;
}
-
if (Cools.isEmpty(destinationCodeData)) {
return;
}
if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
log.info( "{}寮�濮嬩綔涓氭紨绀�...", agvNo);
-
switch (jobType) {
case LOC_PICK:
Integer usedSlotsByLocPick = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
@@ -175,7 +165,6 @@
break;
}
}
-
}
public String getLocCode(String agvNo, AgvDetail agvDetail) {
--
Gitblit v1.9.1