新模型合并

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

@@ -309,12 +309,12 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
                             toApsLastPros.add(toApsPro);
                         }
                     }
+
+                    toApsLastPros.addAll(minTimeAfterPros);
                 }else {
                     toApsLastPros.addAll(toApsPros);
                 }
 
-                toApsLastPros.addAll(minTimeAfterPros);
-
                 apsSolution1.setEquipmentList(equipments);
                 apsSolution1.setProcessesList(toApsLastPros);