新模型合并

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

@@ -254,6 +254,7 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
             apsUtils.groupProsByEqu(apsSolution1.getProcessesList(),equPros);
             // 按设备分批排程
             equPros.forEach((kk,vv)->{
+                String equDes = "";
                 List<EquipmentTa> equipments = new ArrayList<>();
                 for (ProductionProcessesTa productionProcesses : vv) {
                     for (EquipmentTa optionalProviderEquipment : productionProcesses.getOptionalProviderEquipments()) {
@@ -261,6 +262,7 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
                         if(esss == null || esss.size() == 0){
                             optionalProviderEquipment.setTasks(new ArrayList<>());
                             equipments.add(optionalProviderEquipment);
+                            equDes = equDes + " " + optionalProviderEquipment.getEquipmentName()+"("+optionalProviderEquipment.getId()+")";
                         }
                     }
                 }
@@ -324,7 +326,8 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
                 }else{
                     return;
                 }*/
-
+                System.out.println("---------------------------当前设备"+equDes+"  开始调度排程---------------------------");
+                log.info("---------------------------当前设备"+equDes+"  开始调度排程---------------------------");
                 ApsSolutionTa solvedBalance1  = solver.solve(apsSolution1);
                 for (ProductionProcessesTa productionProcesses : solvedBalance1.getProcessesList()) {
                     if(productionProcesses.getOptionalEquipmentZg() != null && productionProcesses.getOptionalEquipmentZg().size()>0){