预排程bug修复

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -56,15 +56,15 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
         List<String> blankids = new ArrayList<>();
-        blankids.add("1dd64c0a6bca4d5fb84055a598d488b4");
+//        blankids.add("6ef514c1ce2347af9a07626c98ac9514");
 //        blankids.add("1dd64c0a6bca4d5fb84055a598d488b4");
 //        blankids.add("7efe679a8e3c4942b88758617cdbc312");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");
 //        blankids.add("efeb1f8d01b04cdb9921c0d1711bb967");
-        /*List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
-                        blankids.contains(v.getProduceOrder().get(0).getId())
-                ).collect(Collectors.toList());
-        productionScheduleVo.setProcesses(collect);*/
+//        List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
+//                        blankids.contains(v.getProduceOrder().get(0).getId())
+//                ).collect(Collectors.toList());
+//        productionScheduleVo.setProcesses(collect);
 
         log.info("*************** 排程开始："+productionScheduleVo.getProductionScheduleId()+" *******************");
         if(productionScheduleVo.getScheduleType().getScheduleType() == null){
@@ -439,6 +439,9 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                                     if(xjctafter.getPreviousProcesses() != null && xjctafter.getPreviousProcesses().size() > 0){
                                         for (ProductionProcesses previousProcess : xjctafter.getPreviousProcesses()) {
                                             List<ProductionProcesses> pres = solvedBalance.getProcessesList().stream().filter(pv -> pv.getId().equals(previousProcess.getId())).collect(Collectors.toList());
+                                            if(pres == null || pres.size() == 0){
+                                                pres = hasLocks.stream().filter(pv -> pv.getId().equals(previousProcess.getId())).collect(Collectors.toList());
+                                            }
                                             previousProcess.setStartTime(pres.get(0).getStartTime());
                                             previousProcess.setEndTime(pres.get(0).getEndTime());
                                             previousProcess.setEquipmentId(pres.get(0).getEquipmentId());