From 7958b0e136e96d2730c2df17a46046d1bbe74358 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 07 四月 2026 10:52:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 6 +++++-
1 files changed, 5 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 b65e2a3..12c4e83 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
@@ -3,6 +3,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
+import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.AgvService;
@@ -52,7 +53,10 @@
this.setSoc(String.valueOf(agvDetail.getSoc()));
}
if (null != agvDetail.getRecentCode()) {
- this.setCode(codeService.getCacheById(agvDetail.getRecentCode()).getData());
+ Code code = codeService.getCacheById(agvDetail.getRecentCode());
+ if (null != code) {
+ this.setCode(code.getData());
+ }
}
List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
--
Gitblit v1.9.1