From 2ad4545ad7246562abc0a5e706a0c61469691908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十一月 2024 14:00:26 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 336317f..d894204 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
@@ -112,11 +112,7 @@
}
// with battery
if (withBattery) {
- if (agvDetail.getVol() < agv.getChargeLine()) {
- log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
- return false;
- }
- if (agvDetail.getVol() < agvModel.getLowBattery()) {
+ if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
log.warn("[{}]鍙稟gv鐢甸噺涓嶈冻......", agv.getUuid());
return false;
}
@@ -160,4 +156,24 @@
return agvModel.getBackpack();
}
+ @Override
+ public Agv findByPosition(Long codeId) {
+ List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>()
+// .eq(Agv::getStatus, StatusType.ENABLE.val)
+ );
+ for (Agv agv : agvList) {
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ if (null == agvDetail) {
+ continue;
+ }
+ if (null == agvDetail.getRecentCode()) {
+ continue;
+ }
+ if (agvDetail.getRecentCode().equals(codeId)) {
+ return agv;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1