From 67a339f3cc89d6e8418c8de4eca45bee769eb78c Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Tue, 16 Apr 2024 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=8B=E6=9C=BA=E7=94=B3=E8=AF=B7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=A4=E6=96=AD=E5=AF=B9=E6=8E=A5=E4=BD=8D=E8=B4=A7?=
 =?UTF-8?q?=E7=89=A9=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lnsh/lnsh_station/LnshStationDeviceDriver.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
index 8b2f32a..bdb41a4 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
@@ -225,9 +225,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
                                 String devicecode="BLJ0"+this.device_code.charAt(3);
                                 DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
                                 Device nextDevice = appService.findDeviceByCode(devicecode);
-                                if (nextDevice.getDeviceDriver() instanceof LnshStationDeviceDriver) {
+                                if (nextDevice!=null && nextDevice.getDeviceDriver() instanceof LnshStationDeviceDriver) {
                                     LnshStationDeviceDriver driver = (LnshStationDeviceDriver) nextDevice.getDeviceDriver();
-                                    if(driver.getAction()==1){
+                                    if(driver.getMove()==1){
                                         log.info("当前压机"+this.device_code+"对应对接位"+driver.device_code+"有货，暂不生成任务");
                                     }else{
                                         callMaterial();