From 158bca3bcaa70bd805636ecbf3f8290dcc211201 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 十月 2024 14:42:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..e710b8e 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
@@ -143,4 +143,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