From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 56015c9..1691277 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -97,6 +97,10 @@
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(this.getBackpack(agv.getId(), agvDetail.getBackpack()));
+ if (null != jobType && null != jobType.increase) {
+ vo.setBackpack(vo.getBackpack() + (jobType.increase ? 1 : -1));
+ }
+ vo.setSlots(agvModel.getBackpack());
vo.setBattery(agvDetail.getSoc());
vo.setJobType(null == jobType ? null : jobType.breif);
vo.setError(agvDetail.realError());
@@ -130,7 +134,7 @@
private Integer getBackpack(Long agvId, String backpackJson) {
if (null == agvId || Cools.isEmpty(backpackJson)) {
- return null;
+ return 0;
}
List<BackpackDto> backpackDtoList = JSON.parseArray(backpackJson, BackpackDto.class);
int jsonCount = (int) backpackDtoList.stream().filter(BackpackDto::getLoaded).count();
--
Gitblit v1.9.1