排产相关-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -191,9 +191,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             WorkOrderDto workOrderDto = new WorkOrderDto();
             String woCode = entry.getKey();
             List<WorkOrderDto> woList = entry.getValue();
-
+            workOrderDto.setWoCode(woCode);
+            workOrderDto.setWorkOrderList(entry.getValue());
+            resultList.add(workOrderDto);
             //按processName二次分组
-            Map<String, List<WorkOrderDto>> processGroup = woList.stream()
+           /* Map<String, List<WorkOrderDto>> processGroup = woList.stream()
                     .collect(Collectors.groupingBy(WorkOrderDto::getProcessName));
 
             //整合每个processName的时间
@@ -238,7 +240,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             mergedProcessList.sort(Comparator.comparing(WorkOrderDto::getPlanStartTime));
             workOrderDto.setWoCode(woCode);
             workOrderDto.setWorkOrderList(mergedProcessList);
-            resultList.add(workOrderDto);
+            resultList.add(workOrderDto);*/
             //resultList.put(woCode, mergedProcessList);
         }