From b9c108ff219f7fbdf8b96b98036e4e8d5572efef Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 29 Jun 2022 09:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedriver/agv/utils/TwoAgvPhase.java        |  3 +++
 .../service/impl/StageActorServiceImpl.java      | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java
index 7e5d7d45..8d75d337 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java
+++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java
@@ -1,5 +1,8 @@
 package org.nl.acs.device_driver.basedriver.agv.utils;
 
+import org.springframework.stereotype.Service;
+
+@Service
 public class TwoAgvPhase implements IAgv {
     @Override
     public String getPhaseName(Integer phase) {
diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
index 4f176fa8..4ad62b30 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
+++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
@@ -71,6 +71,8 @@ import java.util.Map;
 @Slf4j
 public class StageActorServiceImpl implements StageActorService {
     private final RedisUtils redisUtils;
+    private final StorageCellService storageCellService;
+
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -497,12 +499,15 @@ public class StageActorServiceImpl implements StageActorService {
 
                     } else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {
                         agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) device.getDeviceDriver();
-                        StorageCellService storageCellService = SpringContextHolder.getBean("StorageCellService");
                         IAgv oneAgv = SpringContextHolder.getBean(OneAgvPhase.class);
                         obj.put("device_name", agvNdcOneDeviceDriver.getDevice().getDevice_name());
                         int agvaddr_copy = agvNdcOneDeviceDriver.getAgvaddr_copy();
                         StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + "");
-                        jo.put("address",storageCellDto.getAddress());
+                        if (ObjectUtil.isNotEmpty(storageCellDto)){
+                            jo.put("address",storageCellDto.getAddress());
+                        } else {
+                            jo.put("address","");
+                        }
                         int phase = agvNdcOneDeviceDriver.getPhase();
                         String phaseName = oneAgv.getPhaseName(phase);
                         jo.put("phaseName",phaseName);
@@ -511,9 +516,12 @@ public class StageActorServiceImpl implements StageActorService {
                         IAgv twoAgv = SpringContextHolder.getBean(TwoAgvPhase.class);
                         obj.put("device_name", agvNdcTwoDeviceDriver.getDevice().getDevice_name());
                         int agvaddr_copy = agvNdcTwoDeviceDriver.getAgvaddr_copy();
-                        StorageCellService storageCellService = SpringContextHolder.getBean("StorageCellService");
                         StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + "");
-                        jo.put("address",storageCellDto.getAddress());
+                        if (ObjectUtil.isNotEmpty(storageCellDto)){
+                            jo.put("address",storageCellDto.getAddress());
+                        } else {
+                            jo.put("address","");
+                        }
                         int phase = agvNdcTwoDeviceDriver.getPhase();
                         String phaseName = twoAgv.getPhaseName(phase);
                         jo.put("phaseName",phaseName);