From fd0dc8eec755272d9b5adfd58369195db55173c4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 25 六月 2025 10:36:12 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 2cf5b4a..dd3bd42 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
@@ -106,22 +106,29 @@
@Override
public Boolean judgeEnable(Long agvId) {
- return this.judgeEnable(agvId, false);
+ return this.judgeEnable(agvId, false,false);
}
+ /**
+ * 鍒ゆ柇AGV鏄惁鍙敤
+ * @param agvId
+ * @param isLowBattery 浣庣數閲忓垽鏂�
+ * @param force 鏄惁寮哄埗鎿嶄綔
+ * @return
+ */
@Override
- public Boolean judgeEnable(Long agvId, Boolean isLowBattery) {
+ public Boolean judgeEnable(Long agvId, Boolean isLowBattery, Boolean force) {
String agvNo = this.getAgvNo(agvId);
AgvModel agvModel = agvModelService.getByAgvId(agvId);
if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
.eq(Segment::getState, SegmentStateType.RUNNING.toString())
)) {
- log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agvNo);
+// log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 - segment......", agvNo);
return false;
}
if (!this.judgeOnline(agvId)) {
- log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agvNo);
+// log.warn("[{}]鍙稟gv涓嶆槸鍦ㄧ嚎鐘舵��......", agvNo);
return false;
}
AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
@@ -137,8 +144,12 @@
return false;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- if (agvDetail.getVol() < agvModel.getQuaBattery()) {
- return false;
+ if (force){
+
+ }else {
+ if (agvDetail.getVol() < agvModel.getQuaBattery()) {
+ return false;
+ }
}
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -163,6 +174,8 @@
return true;
}
+
+
@Override
public Boolean judgeOnline(Long agvId) {
Agv agv = this.getById(agvId);
--
Gitblit v1.9.1