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();