From cd67e854d4715bc92a16dc7bffdbde7be1da9957 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 27 三月 2025 13:02:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
index 0bf1c9f..b65e2a3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
@@ -26,6 +26,8 @@
private String vol = "-";
+ private String soc = "-";
+
private String pos = "-";
private String code = "-";
@@ -46,8 +48,11 @@
if (null != agvDetail.getVol()) {
this.setVol(String.valueOf(agvDetail.getVol()));
}
+ if (null != agvDetail.getSoc()) {
+ this.setSoc(String.valueOf(agvDetail.getSoc()));
+ }
if (null != agvDetail.getRecentCode()) {
- this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
+ this.setCode(codeService.getCacheById(agvDetail.getRecentCode()).getData());
}
List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
--
Gitblit v1.9.1