Browse Source

排程优化

fangpy 10 tháng trước cách đây
mục cha
commit
4193280327

+ 2 - 2
rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/score/ApsConstraintProvider.java

@@ -1557,7 +1557,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
      */
     private Constraint deliveryDate(ConstraintFactory constraintFactory) {
         return constraintFactory.forEach(ProductionProcesses.class)
-                .filter(productionProcesses -> productionProcesses.getNextProcesses() == null)
+//                .filter(productionProcesses -> productionProcesses.getNextProcesses() == null)
                 .filter(productionProcesses -> {
                     /*
                         获取最后一步工步的结束时间(最后一步工步的结束时间即此产品生产的实际结束时间)
@@ -1609,7 +1609,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
      */
     private Constraint expecteddays(ConstraintFactory constraintFactory) {
         return constraintFactory.forEach(ProductionProcesses.class)
-                .filter(productionProcesses -> productionProcesses.getNextProcesses() == null || productionProcesses.getNextProcesses().size() == 0)
+//                .filter(productionProcesses -> productionProcesses.getNextProcesses() == null || productionProcesses.getNextProcesses().size() == 0)
                 .filter(productionProcesses -> {
                     // 非最后一道工序或者最后一道工序没有排程时间的工序直接跳过
                     if(productionProcesses.getEndTime() == null){