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

fix:内包间行架rgv问题修复

Browse Source
This commit is contained in:
lishuai
2023-12-27 15:47:09 +08:00
parent d53c970bf0
commit c5915c8434
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -831,22 +831,21 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
//按照优先级排序 优先级相等按照创建时间排序 //按照优先级排序 优先级相等按照创建时间排序
taskDtoList = this.sortTask(taskDtoList); taskDtoList = this.sortTask(taskDtoList);
for (int j = 0; j < taskDtoList.size(); j++) { for (int j = 0; j < taskDtoList.size(); j++) {
for (int i1 = 0; i1 < taskDtoList.size(); i1++) { task = taskDtoList.get(j);
task = taskDtoList.get(i1);
Boolean flag; Boolean flag;
if ("6".equals(task.getTruss_type())) { if ("6".equals(task.getTruss_type())) {
flag = checkAgv(task); flag = checkAgv(task);
if (flag) { if (flag) {
break; break;
} }
if (!flag && i1 == taskDtoList.size()-1) { if (!flag && j == taskDtoList.size() - 1) {
notCreateInstMessage = "rgv条件不匹配" + "任务号为：" + task.getTask_code(); notCreateInstMessage = "rgv条件不匹配" + "任务号为：" + task.getTask_code();
return false; return false;
} }
} else { } else {
break; break;
} }
}
// 9 行架任务 // 9 行架任务
if (!StrUtil.equals(task.getTask_type(), "9")) { if (!StrUtil.equals(task.getTask_type(), "9")) {
task = null; task = null;