新模型探索

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

@@ -48,10 +48,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 ->
-                v.getProduceOrder().get(0).getId().equals("eb93a65953e74dd8b73c3759acd208b2"))
+        List<ProductionProcesses> pdps = productionScheduleVo.getProcesses().stream().filter(v ->
+                !v.getProduceOrder().get(0).getId().equals("53bf294756e3457fac9a0e0e174314b3"))
                 .collect(Collectors.toList());
-        productionScheduleVo.setProcesses(pdps);*/
+        productionScheduleVo.setProcesses(pdps);
         // 排程结果对象
         ProductionScheduleRetVo productionScheduleRetVo = new ProductionScheduleRetVo();
         // optaplanner 求解器数据装配
@@ -1798,6 +1798,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
             }
         }
         if(sortType == 1){
+            for (ProductionProcesses source : sources) {
+                if(source.getOrderMark() == null && source.getIfLock()){
+                    source.setOrderMark(0);
+                }
+            }
+
             sources.sort(Comparator.comparing(ProductionProcesses::getOrderMark));
         }
         return processes;

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/taskassigning/TaskStartTimeListenerTa.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.optaplanner.core.api.domain.variable.ListVariableListener;
 import org.optaplanner.core.api.score.director.ScoreDirector;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.*;
 import java.util.stream.IntStream;
 
@@ -75,11 +76,10 @@ public class TaskStartTimeListenerTa implements ListVariableListener<ApsSolution
                 scoreDirector.afterVariableChanged(t, "startTime");
             }
 
-            /*if(t.getNextProcesses() != null && t.getNextProcesses().size()>0){
-                for (ProductionProcesses nextProcess : t.getNextProcesses()) {
-
-                }
-            }*/
+            LocalDateTime specificDateTime = LocalDateTime.of(2026, Month.JANUARY, 1, 12, 30);
+            if(previousEndTime.compareTo(specificDateTime)>0){
+xi                int aa = 0;
+            }
             previousEndTime = t.getEndTime();
         }
     }