From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 2 +-
1 files changed, 1 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 468ad28..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
@@ -134,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