From a4948137774a499da38fe184a6bbd0c57336e6f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十一月 2024 09:48:07 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
index a22e804..f481101 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java
@@ -73,7 +73,7 @@
if (funcSta.getType().equals(FuncStaType.CHARGE.toString())) {
// if the type of this funSta is charge and the existing agv is in charge status, then that means this funSta is occupied
- if (null != agv) {
+ if (null != agv && !agv.getId().equals(agvId)) {
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -118,11 +118,14 @@
}
} else {
- // if there is an agv on the code of this funSta, should we let this agv leave?
- // we need to judge whether the agv went to this funSta based on a task which in GO_STANDBY type
+ if (!agv.getId().equals(agvId)) {
+ // if there is an agv on the code of this funSta, should we let this agv leave?
+ // we need to judge whether the agv went to this funSta based on a task which in GO_STANDBY type
// Task latestTaskByAgv = taskService.findLatestTask(existAgv.getId());
- return false;
+ return false;
+ }
+
}
}
--
Gitblit v1.9.1