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-13 23:00:54 +08:00
parent aa3c30c252
commit 52276bb6bf
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,17 +159,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.findByCodeFromCache(inst1.getTask_code()); // TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
if (ObjectUtil.isNotEmpty(taskDto)) { // if (ObjectUtil.isNotEmpty(taskDto)) {
if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { // if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
JSONArray array = new JSONArray(); // JSONArray array = new JSONArray();
JSONObject map = new JSONObject(); // JSONObject map = new JSONObject();
map.put("task_id", taskDto.getExt_task_id()); // map.put("task_id", taskDto.getExt_task_id());
map.put("task_status", "1"); // map.put("task_status", "1");
array.add(map); // array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array); // acsToWmsService.feedbackTaskStatusToWms(array);
} // }
} // }
} }
} }
} }

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

@@ -212,17 +212,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
//当前执行步骤为更新任务状态 //当前执行步骤为更新任务状态
inst1.setInstruction_status("1"); inst1.setInstruction_status("1");
instructionService.update(inst1); instructionService.update(inst1);
TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); // TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
if (!ObjectUtil.isEmpty(taskDto)) { // if (!ObjectUtil.isEmpty(taskDto)) {
if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { // if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
JSONArray array = new JSONArray(); // JSONArray array = new JSONArray();
JSONObject map = new JSONObject(); // JSONObject map = new JSONObject();
map.put("task_id", taskDto.getExt_task_id()); // map.put("task_id", taskDto.getExt_task_id());
map.put("task_status", "1"); // map.put("task_status", "1");
array.add(map); // array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array); // acsToWmsService.feedbackTaskStatusToWms(array);
} // }
} // }
; ;
//this.setNow_steps_type1(1); //this.setNow_steps_type1(1);
} }
@@ -239,17 +239,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
now_steps_type2 = 1; now_steps_type2 = 1;
inst2.setInstruction_status("1"); inst2.setInstruction_status("1");
instructionService.update(inst2); instructionService.update(inst2);
TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); // TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
if (!ObjectUtil.isEmpty(taskDto)) { // if (!ObjectUtil.isEmpty(taskDto)) {
if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { // if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
JSONArray array = new JSONArray(); // JSONArray array = new JSONArray();
JSONObject map = new JSONObject(); // JSONObject map = new JSONObject();
map.put("task_id", taskDto.getExt_task_id()); // map.put("task_id", taskDto.getExt_task_id());
map.put("task_status", "1"); // map.put("task_status", "1");
array.add(map); // array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array); // acsToWmsService.feedbackTaskStatusToWms(array);
} // }
} // }
; ;
// this.setNow_steps_type2(1); // this.setNow_steps_type2(1);
} }
@@ -265,17 +265,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
//当前指令更新状态 //当前指令更新状态
inst2.setInstruction_status("1"); inst2.setInstruction_status("1");
instructionService.update(inst2); instructionService.update(inst2);
TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); // TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
if (!ObjectUtil.isEmpty(taskDto)) { // if (!ObjectUtil.isEmpty(taskDto)) {
if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { // if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
JSONArray array = new JSONArray(); // JSONArray array = new JSONArray();
JSONObject map = new JSONObject(); // JSONObject map = new JSONObject();
map.put("task_id", taskDto.getExt_task_id()); // map.put("task_id", taskDto.getExt_task_id());
map.put("task_status", "1"); // map.put("task_status", "1");
array.add(map); // array.add(map);
acsToWmsService.feedbackTaskStatusToWms(array); // acsToWmsService.feedbackTaskStatusToWms(array);
} // }
} // }
; ;
} }
} }