一件排产

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

@@ -772,7 +772,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
             Operation operation = it.next().getValue();
             for(TTask task : taskList){
                 if(task.getTmpId().equals(operation.getId())){
-                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()));
+                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).
+                            eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()).orderByDesc(BomProcedureProductionresource::getCreateTime));
                     task.setExpectStartTime(new Date(operation.getStart()));
                     task.setExpectEndTime(new Date(operation.getFinish()));
                     task.setResourceId(operation.getMachineId());

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

@@ -309,15 +309,15 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 //        Map<Long, ResourceBusiness> resourceBusinessMap = resourceBusinessList.stream().collect(Collectors.toMap(ResourceBusiness::getId, t->t));
 
         List<ResourceAutoCode> resourceAutoCodeList = resourceAutoCodeService.list(Wraps.<ResourceAutoCode>lbQ().orderByAsc(ResourceAutoCode::getWeight));
-        Map<Long, List<ResourceAutoCode>> resourceAutoCodeMap = resourceAutoCodeList.stream().collect(groupingBy(ResourceAutoCode::getResourceId));
+        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;
             for (TTask t : taskList) {
                 //取出resrouceId
-                Long resourceId = t.getResourceId();
-                List<ResourceAutoCode> autoCodeList = resourceAutoCodeMap.get(resourceId);
+                Long resourceBusinessId = t.getResourceBusinessId();
+                List<ResourceAutoCode> autoCodeList = resourceAutoCodeMap.get(resourceBusinessId);
 
                 //查询所有的父节点
                 List<ResourceAutoCode>parentResourceAutoCodeList = autoCodeList.stream().filter(a->a.getParentId().longValue()==0L).collect(Collectors.toList());