diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index ac092c6..c44c55a 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -783,6 +783,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo1.put("material_type", dto.getMaterial()); jo1.put("batch", dto.getBatch()); jo1.put("vehicle_code", dto.getVehicle_code()); + jo1.put("source_device", dto.getStart_device_code()); deviceService.changeDeviceStatus(jo1); LampThreecolorDeviceDriver lampThreecolorDeviceDriver; diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java index b08788c..49b5a8f 100644 --- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java +++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryXZAgvTaskStatus.java @@ -109,11 +109,11 @@ public class QueryXZAgvTaskStatus { } } else if ("STOPPED".equals(state) || "FAILED".equals(state) || "Error".equals(state)) { if (inst != null) { -// inst.setInstruction_status("1"); -// instructionService.update(inst); + inst.setInstruction_status("1"); + instructionService.update(inst); //任务失败时取消指令和任务 - instructionService.cancel(inst.getInstruction_id()); - taskService.cancel(inst.getTask_id()); +// instructionService.cancel(inst.getInstruction_id()); +// taskService.cancel(inst.getTask_id()); } } // else if ("STOPPED".equals(state)){