diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index 77564a5b3..f407a5dd1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -322,7 +322,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr } else { this.require_apply_strangulation_time = date; Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task)); - if (StrUtil.isEmpty(inst.getVehicle_code())) { + if (ObjectUtil.isEmpty(inst) && StrUtil.isEmpty(inst.getVehicle_code())) { message = LangProcess.msg("one_message8") + ": " + task + LangProcess.msg("one_message11"); return; } @@ -530,11 +530,11 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr map12.put("value", labelingTemplate); Map map13 = new HashMap(); - map13.put("code", "to_leight"); + map13.put("code", "to_length"); map13.put("value", length); list.add(map13); Map map14 = new HashMap(); - map14.put("code", "to_wedth"); + map14.put("code", "to_width"); map14.put("value", width); list.add(map14); Map map15 = new HashMap();