瀏覽代碼

退火超出装炉量bug修改

fangpy 4 月之前
父節點
當前提交
f9165afe69

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

@@ -45,10 +45,10 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
     public ProductionScheduleRetVo productionLxSchedule(ProductionScheduleVo productionScheduleVo) throws Exception {
         log.info("*************** 排程开始(productionLxSchedule):"+productionScheduleVo.getProductionScheduleId()+" *******************");
 
-        List<ProductionProcesses> pdps = productionScheduleVo.getProcesses().stream().filter(v ->
+        /*List<ProductionProcesses> pdps = productionScheduleVo.getProcesses().stream().filter(v ->
                 v.getProduceOrder().get(0).getId().equals("eb93a65953e74dd8b73c3759acd208b2"))
                 .collect(Collectors.toList());
-        productionScheduleVo.setProcesses(pdps);
+        productionScheduleVo.setProcesses(pdps);*/
         // 排程结果对象
         ProductionScheduleRetVo productionScheduleRetVo = new ProductionScheduleRetVo();
         // optaplanner 求解器数据装配
@@ -93,8 +93,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
 
         String cores = Runtime.getRuntime().availableProcessors() + "";
         SolverFactory<ApsSolution> solverFactory = SolverFactory.create(new SolverConfig()
-//                        .withEnvironmentMode(EnvironmentMode.REPRODUCIBLE)
-                        .withEnvironmentMode(EnvironmentMode.FULL_ASSERT)
+                        .withEnvironmentMode(EnvironmentMode.REPRODUCIBLE)
+//                        .withEnvironmentMode(EnvironmentMode.FULL_ASSERT)
                         .withSolutionClass(ApsSolution.class)
                         .withEntityClasses(ProductionProcesses.class, Equipment.class)
                         .withConstraintProviderClass(ApsConstraintListProvider.class)