From 459f341454ad32660d79ec59d5db08cba3588696 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十月 2024 16:18:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 804cd5b..59e06fd 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
@@ -49,7 +49,7 @@
@Override
public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
- return new PageResult<AgvResult>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
+ return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
}
@Override
@@ -81,6 +81,7 @@
i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
})
) > 0) {
+ log.warn("[{}]鍙稟gv姝ｅ湪蹇欑 -segment......", agv.getUuid());
return false;
}
if (!this.judgeOnline(agv.getId())) {
@@ -111,7 +112,7 @@
}
if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getPos() != 1) {
- log.warn("[{}]鍙稟gv璇风Щ鍔ㄥ埌瀹氫綅......", agv.getUuid());
+ log.warn("[{}]鍙稟gv褰撳墠涓嶅湪瀹氫綅......", agv.getUuid());
return false;
}
}
@@ -143,4 +144,14 @@
return res;
}
+ @Override
+ public Integer getBackpack(Agv agv) {
+ if (null != agv.getStage()) {
+ return agv.getStage();
+ }
+ AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ assert null != agvModel;
+ return agvModel.getBackpack();
+ }
+
}
--
Gitblit v1.9.1