From 5b4e93239cae29c17be6fe93050669aed296ec16 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 1 Dec 2022 11:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OvenGantryManipulatorDeviceDriver.java | 34 ++++--- .../SlitTwoManipulatorDeviceDriver.java | 91 +++++++++++-------- .../org/nl/acs/task/service/dto/TaskDto.java | 2 +- 3 files changed, 75 insertions(+), 52 deletions(-) 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 771fa8be7..7374f9735 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 @@ -153,13 +153,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (StrUtil.equals(inst1.getInstruction_status(), "0")) { inst1.setInstruction_status("1"); instructionService.update(inst1); - TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); - 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); + } + } } } } @@ -211,12 +215,16 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i e.printStackTrace(); } TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getTask_id()); - map.put("task_status", "2"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); + if (ObjectUtil.isNotEmpty(taskDto)){ + if (StrUtil.isNotEmpty(taskDto.getExt_task_id())){ + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("task_id", taskDto.getTask_id()); + map.put("task_status", "2"); + array.add(map); + acsToWmsService.feedbackTaskStatusToWms(array); + } + } String next_device_code = taskDto.getNext_device_code(); String start_device_code = taskDto.getStart_device_code(); Device startDevice = deviceAppService.findDeviceByCode(start_device_code); 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 26aa4facf..017e6103e 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 @@ -186,13 +186,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (StrUtil.equals(inst1.getInstruction_status(), "0")) { inst1.setInstruction_status("1"); instructionService.update(inst1); - TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); - 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); + } + }; } } } @@ -203,19 +207,22 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); if (inst1 != null) { if (StrUtil.equals(inst1.getInstruction_status(), "1")) { - finish_instruction(inst1); - JSONArray array = new JSONArray(); - TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "2"); - map.put("finished_type", "1"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - writing("to_command1", "0"); - writing("to_onset1", "0"); - writing("to_target1", "0"); - writing("to_task1", "0"); + this.finish_instruction(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", "2"); + array.add(map); + acsToWmsService.feedbackTaskStatusToWms(array); + } + }; + this.writing("to_command1", "0"); + this.writing("to_onset1", "0"); + this.writing("to_target1", "0"); + this.writing("to_task1", "0"); } } } @@ -228,13 +235,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (StrUtil.equals(inst2.getInstruction_status(), "0")) { inst2.setInstruction_status("1"); instructionService.update(inst2); - TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); - 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); + } + }; } } } @@ -245,17 +256,21 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (inst2 != null) { if (StrUtil.equals(inst2.getInstruction_status(), "1")) { finish_instruction(inst2); - JSONArray array = new JSONArray(); - TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); - JSONObject map = new JSONObject(); - map.put("task_id", taskDto.getExt_task_id()); - map.put("task_status", "2"); - array.add(map); - acsToWmsService.feedbackTaskStatusToWms(array); - writing("to_command2", "0"); - writing("to_onset2", "0"); - writing("to_target2", "0"); - writing("to_task2", "0"); + 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", "2"); + array.add(map); + acsToWmsService.feedbackTaskStatusToWms(array); + } + }; + this.writing("to_command2", "0"); + this.writing("to_onset2", "0"); + this.writing("to_target2", "0"); + this.writing("to_task2", "0"); } } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java index e99b38691..9e4e6e315 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java @@ -59,7 +59,7 @@ public class TaskDto implements Serializable { /** * 再次请求 */ - private String request_again; + private String request_again = "0"; private String request_again_success; /**