root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2022-12-01 11:02:42 +08:00
parent 0781e71d48
commit 5b4e93239c
3 changed files with 75 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -153,13 +153,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (StrUtil.equals(inst1.getInstruction_status(), "0")) { if (StrUtil.equals(inst1.getInstruction_status(), "0")) {
inst1.setInstruction_status("1"); inst1.setInstruction_status("1");
instructionService.update(inst1); instructionService.update(inst1);
TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
JSONArray array = new JSONArray(); if (ObjectUtil.isNotEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())){
map.put("task_id", taskDto.getExt_task_id()); JSONArray array = new JSONArray();
map.put("task_status", "1"); JSONObject map = new JSONObject();
array.add(map); map.put("task_id", taskDto.getExt_task_id());
acsToWmsService.feedbackTaskStatusToWms(array); map.put("task_status", "1");
array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array);
}
}
} }
} }
} }
@@ -211,12 +215,16 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
e.printStackTrace(); e.printStackTrace();
} }
TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); TaskDto taskDto = taskserver.findByCode(inst2.getTask_code());
JSONArray array = new JSONArray(); if (ObjectUtil.isNotEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())){
map.put("task_id", taskDto.getTask_id()); JSONArray array = new JSONArray();
map.put("task_status", "2"); JSONObject map = new JSONObject();
array.add(map); map.put("task_id", taskDto.getTask_id());
acsToWmsService.feedbackTaskStatusToWms(array); map.put("task_status", "2");
array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array);
}
}
String next_device_code = taskDto.getNext_device_code(); String next_device_code = taskDto.getNext_device_code();
String start_device_code = taskDto.getStart_device_code(); String start_device_code = taskDto.getStart_device_code();
Device startDevice = deviceAppService.findDeviceByCode(start_device_code); Device startDevice = deviceAppService.findDeviceByCode(start_device_code);

91
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -186,13 +186,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
if (StrUtil.equals(inst1.getInstruction_status(), "0")) { if (StrUtil.equals(inst1.getInstruction_status(), "0")) {
inst1.setInstruction_status("1"); inst1.setInstruction_status("1");
instructionService.update(inst1); instructionService.update(inst1);
TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
JSONArray array = new JSONArray(); if (!ObjectUtil.isEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
map.put("task_id", taskDto.getExt_task_id()); JSONArray array = new JSONArray();
map.put("task_status", "1"); JSONObject map = new JSONObject();
array.add(map); map.put("task_id", taskDto.getExt_task_id());
acsToWmsService.feedbackTaskStatusToWms(array); 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)); Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1));
if (inst1 != null) { if (inst1 != null) {
if (StrUtil.equals(inst1.getInstruction_status(), "1")) { if (StrUtil.equals(inst1.getInstruction_status(), "1")) {
finish_instruction(inst1); this.finish_instruction(inst1);
JSONArray array = new JSONArray(); TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); if (!ObjectUtil.isEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
map.put("task_id", taskDto.getExt_task_id()); JSONArray array = new JSONArray();
map.put("task_status", "2"); JSONObject map = new JSONObject();
map.put("finished_type", "1"); map.put("task_id", taskDto.getExt_task_id());
array.add(map); map.put("task_status", "2");
acsToWmsService.feedbackTaskStatusToWms(array); array.add(map);
writing("to_command1", "0"); acsToWmsService.feedbackTaskStatusToWms(array);
writing("to_onset1", "0"); }
writing("to_target1", "0"); };
writing("to_task1", "0"); 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")) { if (StrUtil.equals(inst2.getInstruction_status(), "0")) {
inst2.setInstruction_status("1"); inst2.setInstruction_status("1");
instructionService.update(inst2); instructionService.update(inst2);
TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
JSONArray array = new JSONArray(); if (!ObjectUtil.isEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())){
map.put("task_id", taskDto.getExt_task_id()); JSONArray array = new JSONArray();
map.put("task_status", "1"); JSONObject map = new JSONObject();
array.add(map); map.put("task_id", taskDto.getExt_task_id());
acsToWmsService.feedbackTaskStatusToWms(array); 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 (inst2 != null) {
if (StrUtil.equals(inst2.getInstruction_status(), "1")) { if (StrUtil.equals(inst2.getInstruction_status(), "1")) {
finish_instruction(inst2); finish_instruction(inst2);
JSONArray array = new JSONArray(); TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); if (!ObjectUtil.isEmpty(taskDto)){
JSONObject map = new JSONObject(); if (StrUtil.isNotEmpty(taskDto.getExt_task_id())){
map.put("task_id", taskDto.getExt_task_id()); JSONArray array = new JSONArray();
map.put("task_status", "2"); JSONObject map = new JSONObject();
array.add(map); map.put("task_id", taskDto.getExt_task_id());
acsToWmsService.feedbackTaskStatusToWms(array); map.put("task_status", "2");
writing("to_command2", "0"); array.add(map);
writing("to_onset2", "0"); acsToWmsService.feedbackTaskStatusToWms(array);
writing("to_target2", "0"); }
writing("to_task2", "0"); };
this.writing("to_command2", "0");
this.writing("to_onset2", "0");
this.writing("to_target2", "0");
this.writing("to_task2", "0");
} }
} }
} }

2
acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
View File

@@ -59,7 +59,7 @@ public class TaskDto implements Serializable {
/** /**
* 再次请求 * 再次请求
*/ */
private String request_again; private String request_again = "0";
private String request_again_success; private String request_again_success;
/** /**