Bladeren bron

一键生产时tasknode加入是否需要agv判断

yejian 3 jaren geleden
bovenliggende
commit
a682742859

+ 8 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -333,7 +333,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 //                for (ResourceAutoCode pautoCode : parentResourceAutoCodeList) {//父节点
                 for (int parentCount = 0; parentCount< parentResourceAutoCodeList.size(); parentCount++) { //父节点
                     ResourceAutoCode pautoCode =parentResourceAutoCodeList.get(parentCount);
-                    List<ResourceAutoCode>childResourceAutoCodeList = autoCodeList.stream().filter(a->pautoCode.getId().toString().equals(a.getParentId().toString())).collect(Collectors.toList());
+                    List<ResourceAutoCode> childResourceAutoCodeList = autoCodeList.stream().filter(a->pautoCode.getId().toString().equals(a.getParentId().toString())).collect(Collectors.toList());
+                    List<ResourceAutoCode> agvlist = childResourceAutoCodeList.stream().filter(a->"2".equals(a.getCategory())).collect(Collectors.toList());
                     for (int count = 0; count < childResourceAutoCodeList.size(); count++) { //子节点
                         ResourceAutoCode autoCode = childResourceAutoCodeList.get(count);
                         ResourceAutoCode nextAutoCode = null;
@@ -341,6 +342,12 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                             nextAutoCode = childResourceAutoCodeList.get(count + 1);
                         }
                         TaskNode taskNode = new TaskNode();
+                        // 包含agv动作
+                        if(count == 0  && agvlist.size() > 0){
+                            taskNode.setFindAgvFlag("1");
+                        }else{
+                            taskNode.setFindAgvFlag("0");
+                        }
 //                    taskNode.setAutoNode(autoNode).setAutoNodeCode(autoNode.getCode()).setCompleteBatchNo(t.getCompleteBatchNo())
 //                            .setNodeNo(autoNode.getNodeNo()).setExeStatus("1").setPrority(autoCode.getWeight());
                         taskNode.setTaskId(t.getId()).setOrderId(t.getOrderId())