root/rongLiHongFeng
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:04:17 +08:00
parent 65b13047d7
commit b96a32c2e2
3 changed files with 35 additions and 35 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/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java
View File

@@ -153,17 +153,17 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
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);
} // }
} // }
} }
} }

44
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
View File

@@ -192,17 +192,17 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
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);
} // }
} // }
} }
} }
@@ -242,17 +242,17 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
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.findByCodeFromCache(inst2.getTask_code()); // TaskDto taskDto = taskserver.findByCodeFromCache(inst2.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);
} // }
} // }
} }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -285,7 +285,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
TaskDto task = iterator.next(); TaskDto task = iterator.next();
if (task.getStart_device_code().equals(device_code) && StrUtil.equals(task.getTask_status(), "1")) { if (task.getStart_device_code().equals(device_code) && StrUtil.equals(task.getTask_status(), "1")) {
Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code());
if (ObjectUtil.isNotEmpty(instruction)){ if (ObjectUtil.isNotEmpty(instruction)) {
list.add(task); list.add(task);
} }
} }
@@ -562,7 +562,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
JSONObject feed_jo = new JSONObject(); JSONObject feed_jo = new JSONObject();
feed_jo.put("task_id", entity.getTask_id()); feed_jo.put("task_id", entity.getExt_task_id());
feed_jo.put("task_code", dto.getTask_code()); feed_jo.put("task_code", dto.getTask_code());
feed_jo.put("task_status", dto.getTask_status()); feed_jo.put("task_status", dto.getTask_status());
JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();