diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 6333abb68..6b8502dc6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -159,17 +159,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (StrUtil.equals(inst1.getInstruction_status(), "0")) { inst1.setInstruction_status("1"); instructionService.update(inst1); - TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); - if (ObjectUtil.isNotEmpty(taskDto)) { - if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "1"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - } - } +// TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); +// if (ObjectUtil.isNotEmpty(taskDto)) { +// if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { +// JSONArray array = new JSONArray(); +// JSONObject map = new JSONObject(); +// map.put("task_id", taskDto.getExt_task_id()); +// map.put("task_status", "1"); +// array.add(map); +// acsToWmsService.feedbackTaskStatusToWms(array); +// } +// } } } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 71ff21035..4647d2fa6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -212,17 +212,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl //当前执行步骤为更新任务状态 inst1.setInstruction_status("1"); instructionService.update(inst1); - TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); - if (!ObjectUtil.isEmpty(taskDto)) { - if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "1"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - } - } +// TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); +// if (!ObjectUtil.isEmpty(taskDto)) { +// if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { +// JSONArray array = new JSONArray(); +// JSONObject map = new JSONObject(); +// map.put("task_id", taskDto.getExt_task_id()); +// map.put("task_status", "1"); +// array.add(map); +// acsToWmsService.feedbackTaskStatusToWms(array); +// } +// } ; //this.setNow_steps_type1(1); } @@ -239,17 +239,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl now_steps_type2 = 1; inst2.setInstruction_status("1"); instructionService.update(inst2); - TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); - if (!ObjectUtil.isEmpty(taskDto)) { - if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "1"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - } - } +// TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); +// if (!ObjectUtil.isEmpty(taskDto)) { +// if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { +// JSONArray array = new JSONArray(); +// JSONObject map = new JSONObject(); +// map.put("task_id", taskDto.getExt_task_id()); +// map.put("task_status", "1"); +// array.add(map); +// acsToWmsService.feedbackTaskStatusToWms(array); +// } +// } ; // this.setNow_steps_type2(1); } @@ -265,17 +265,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl //当前指令更新状态 inst2.setInstruction_status("1"); instructionService.update(inst2); - TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); - if (!ObjectUtil.isEmpty(taskDto)) { - if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "1"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - } - } +// TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); +// if (!ObjectUtil.isEmpty(taskDto)) { +// if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { +// JSONArray array = new JSONArray(); +// JSONObject map = new JSONObject(); +// map.put("task_id", taskDto.getExt_task_id()); +// map.put("task_status", "1"); +// array.add(map); +// acsToWmsService.feedbackTaskStatusToWms(array); +// } +// } ; } }