From ec0afb5dca23000cc9b161d9026afaf821ee0b14 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 5 Jul 2022 14:58:26 +0800
Subject: [PATCH] 1

---
 .../instruction/service/impl/InstructionServiceImpl.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index a2dc616b..2fd92034 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -744,8 +744,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         JSONObject jo1 = new JSONObject();
         jo1.put("device_code", instnextdevice);
 
-        String start_point_code = entity.getStart_point_code();
-        Device deviceByCode = deviceAppService.findDeviceByCode(start_point_code);
+        String start_device_code = entity.getStart_device_code();
+
+        Device deviceByCode = deviceAppService.findDeviceByCode(start_device_code);
+        if (deviceByCode == null) {
+            log.debug("地址对应设备未找到");
+            throw new BadRequestException("地址对应设备未找到");
+        }
         if(deviceByCode.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver){
             jo1.put("hasGoodStatus", "2");
         } else {