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

rev:修复无路由路线时取消任务索引越界

Browse Source
This commit is contained in:
gengby
2024-01-10 14:09:41 +08:00
parent a9d36024bb
commit eb1fae7313
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -940,6 +940,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
entity.getStart_device_code(), entity.getStart_device_code(),
entity.getNext_device_code(), entity.getNext_device_code(),
entity.getRoute_plan_code()); entity.getRoute_plan_code());
if (ObjectUtil.isNotEmpty(shortPathsList)) {
String type = shortPathsList.get(0).getType(); String type = shortPathsList.get(0).getType();
// != 0 为agv任务 // != 0 为agv任务
if (!StrUtil.equals(type, "0")) { if (!StrUtil.equals(type, "0")) {
@@ -949,6 +950,8 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
} }
} }
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void cancelNoSendWms(String id) throws Exception { public void cancelNoSendWms(String id) throws Exception {
@@ -1373,7 +1376,6 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
} }
@Override @Override
public TaskDto findByEndCodeAndReady(String device_code) { public TaskDto findByEndCodeAndReady(String device_code) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
@@ -1392,8 +1394,6 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
} }
@Override @Override
public TaskDto findByStartCode(String device_code) { public TaskDto findByStartCode(String device_code) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();