订单

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

@@ -271,15 +271,12 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 //        List<AutoNode> autoList = autoNodeMapper.getNodeList(model);
 //        Map<Long, List<AutoNode>> autoNodeMap = autoList.stream().collect(groupingBy(AutoNode::getProcedureId));
 
-        List<ResourceBusiness>resourceBusinessList = resourceBusinessService.list();
-        Map<Long, ResourceBusiness> resourceBusinessMap = resourceBusinessList.stream().collect(Collectors.toMap(ResourceBusiness::getId, t->t));
+//        List<ResourceBusiness>resourceBusinessList = resourceBusinessService.list();
+//        Map<Long, ResourceBusiness> resourceBusinessMap = resourceBusinessList.stream().collect(Collectors.toMap(ResourceBusiness::getId, t->t));
 
-        List<ResourceAutoCode> resourceAutoCodeList = resourceAutoCodeService.list();
+        List<ResourceAutoCode> resourceAutoCodeList = resourceAutoCodeService.list(Wraps.<ResourceAutoCode>lbQ().orderByDesc(ResourceAutoCode::getWeight));
         Map<Long, List<ResourceAutoCode>> resourceAutoCodeMap = resourceAutoCodeList.stream().collect(groupingBy(ResourceAutoCode::getBusinessId));
 
-
-
-
         List<TaskNode> taskNodeList = new ArrayList<TaskNode>();
         for (String key : taskMap.keySet()) {
             int i = 1;
@@ -288,34 +285,29 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                 Long resourceBusinessId = t.getResourceBusinessId();
                 List<ResourceAutoCode> autoCodeList = resourceAutoCodeMap.get(resourceBusinessId);
 
-                for (ResourceAutoCode autoCode : autoCodeList) {
-                    TaskNode taskNode = new TaskNode();
+                //查询所有的父节点
+                List<ResourceAutoCode>parentResourceAutoCodeList = autoCodeList.stream().filter(a->a.getParentId()==null).collect(Collectors.toList());
+                for (ResourceAutoCode pautoCode : parentResourceAutoCodeList) {//父节点
+                    List<ResourceAutoCode>childResourceAutoCodeList = autoCodeList.stream().filter(a->pautoCode.getId().toString().equals(a.getParentId().toString())).collect(Collectors.toList());
+                    for (ResourceAutoCode autoCode : childResourceAutoCodeList) {//子节点
+                        TaskNode taskNode = new TaskNode();
 //                    taskNode.setAutoNode(autoNode).setAutoNodeCode(autoNode.getCode()).setCompleteBatchNo(t.getCompleteBatchNo())
 //                            .setNodeNo(autoNode.getNodeNo()).setExeStatus("1").setPrority(autoCode.getWeight());
-                    taskNode.setTaskId(t.getId()).setOrderId(t.getOrderId())
-                            //.setResourceId(autoNode.getResourceId())
-                            .setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE));
-                    taskNode.setNodeNo(autoCode.getNo());
-                    taskNode.setCompleteBatchNo(t.getCompleteBatchNo())
-                            .setExeStatus("1").setPrority(autoCode.getWeight());
+                        taskNode.setTaskId(t.getId()).setOrderId(t.getOrderId())
+                                .setResourceId(getResourceIdByAutoCode(autoCode))
+                                .setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE));
+                        taskNode.setNodeNo(autoCode.getNo());
+                        taskNode.setCompleteBatchNo(t.getCompleteBatchNo())
+                                .setExeStatus("1").setPrority(autoCode.getWeight());
 //                    if (autoNode.getInterfaceType() != null) {
 //                        taskNode.setInterfaceType(autoNode.getInterfaceType().getKey());
 //                    }
-                    taskNode.setCompleteBatchSort(i);
-                    taskNodeList.add(taskNode);
-                    i++;
-                }
-
-
-
-
-
-
-
-
-
-
+                        taskNode.setCompleteBatchSort(i);
+                        taskNodeList.add(taskNode);
+                        i++;
+                    }
 
+                }
 
 
 
@@ -351,6 +343,17 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
     }
 
 
+    /**
+     * 获取具体的生产资源
+     * @param autoCode
+     * @return
+     */
+    private Long getResourceIdByAutoCode(ResourceAutoCode autoCode){
+        Long resourceId = 0L;
+        return resourceId;
+    }
+
+
     /**
      * 获取上下料站的员工
      *