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 {