From 481c47f602eb0ec69d4f740f84680348f2d86b79 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 十二月 2024 09:49:47 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
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 545cfc7..1136ac6 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
@@ -72,7 +72,7 @@
}
@Override
- public Boolean judgeEnable(Long agvId, Boolean withBattery) {
+ public Boolean judgeEnable(Long agvId, Boolean isLowBattery) {
Agv agv = this.getById(agvId);
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
@@ -85,14 +85,6 @@
log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agv.getUuid());
return false;
}
-// if (0 < taskService.count(new LambdaQueryWrapper<Task>()
-// .eq(Task::getAgvId, agvId)
-// .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
-// .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
-// )){
-// log.warn("[{}]鍙稟gv姝ｅ湪鍘诲厖鐢� - task......", agv.getUuid());
-// return false;
-// }
if (!this.judgeOnline(agv.getId())) {
log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agv.getUuid());
return false;
@@ -110,7 +102,7 @@
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() <= agvModel.getQuaBattery()) {
+ if (agvDetail.getVol() < agvModel.getQuaBattery()) {
return false;
}
}
@@ -119,9 +111,13 @@
log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
return false;
}
+ if (null == agvDetail.getRecentCode()) {
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
+ return false;
+ }
}
// with battery
- if (withBattery) {
+ if (isLowBattery) {
if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
return false;
--
Gitblit v1.9.1