|
@@ -50,12 +50,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
|
*/
|
|
|
@Override
|
|
|
public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
|
|
|
- List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
|
|
|
+ /*List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
|
|
|
"17ec0583bac645289edceba3dcd88782".equals(v.getProduceOrder().get(0).getId())
|
|
|
|| "7cc30ae6ddc442dbb544665e9372d43d".equals(v.getProduceOrder().get(0).getId())
|
|
|
|| "3e48a015dabe47468af18f59b9f3d567".equals(v.getProduceOrder().get(0).getId())
|
|
|
).collect(Collectors.toList());
|
|
|
- productionScheduleVo.setProcesses(collect);
|
|
|
+ productionScheduleVo.setProcesses(collect);*/
|
|
|
|
|
|
log.info("*************** 排程开始:"+productionScheduleVo.getProductionScheduleId()+" *******************");
|
|
|
if(productionScheduleVo.getScheduleType().getScheduleType() == null){
|
|
@@ -718,6 +718,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
|
solvedBalance.setProcessesList(processes);
|
|
|
}
|
|
|
|
|
|
+ Map<String, List<ProductionProcesses>> listMap = solvedBalance.getProcessesList().stream().collect(Collectors.groupingBy(ProductionProcesses::getId));
|
|
|
+ listMap.forEach((k,v)->{
|
|
|
+ if(v.size()>1){
|
|
|
+ System.out.println(v);
|
|
|
+ }
|
|
|
+ });
|
|
|
for (ProductionProcesses productionProcesses : solvedBalance.getProcessesList()) {
|
|
|
productionProcesses.setPreviousProcesses(null);
|
|
|
productionProcesses.setRooprocess(null);
|