فهرست منبع

链式变量模型

fangpy 6 ماه پیش
والد
کامیت
6b31cf25ab

+ 2 - 2
rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/domain/ProductionProcesses.java

@@ -105,6 +105,7 @@ public class ProductionProcesses implements Serializable {
     /**
      * 工步生产时的设备
      */
+    @InverseRelationShadowVariable(sourceVariableName = "tasks")
     private Equipment equipment;
 
     /**
@@ -212,6 +213,7 @@ public class ProductionProcesses implements Serializable {
     /**
      * 开始时间
      */
+    @ShadowVariable(variableListenerClass = TaskStartTimeListenerTa.class, sourceEntityClass = Equipment.class, sourceVariableName = "tasks")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
@@ -397,7 +399,6 @@ public class ProductionProcesses implements Serializable {
         this.equipmentType = equipmentType;
     }
 
-    @InverseRelationShadowVariable(sourceVariableName = "tasks")
 //    @PlanningVariable(valueRangeProviderRefs={"equipmentRange"})
 //    @AnchorShadowVariable(sourceVariableName = "previousStep")
     public Equipment getEquipment() {
@@ -467,7 +468,6 @@ public class ProductionProcesses implements Serializable {
 //    @ShadowVariable(variableListenerClass = TaskStartTimeListener.class, sourceVariableName = "equipment")
 //    @ShadowVariable(variableListenerClass = TaskStartTimeListener.class, sourceVariableName = "delay")
 //    @AnchorShadowVariable(sourceVariableName = "equipment")
-    @ShadowVariable(variableListenerClass = TaskStartTimeListenerTa.class, sourceEntityClass = Equipment.class, sourceVariableName = "tasks")
     public LocalDateTime getStartTime() {
         return startTime;
     }

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

@@ -129,10 +129,10 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 }
             }
         });
-        List<Equipment> allequipmentList = apsSolution.getEquipmentList();
+        /*List<Equipment> allequipmentList = apsSolution.getEquipmentList();
         List<Equipment> equipments = allequipmentList.stream().filter(v -> v.getId().equals(apsSolution.getProcessesList().get(0).getOptionalEquipments().get(0))).collect(Collectors.toList());
         equipments.get(0).setTasks(apsSolution.getProcessesList());
-        apsSolution.setEquipmentList(equipments);
+        apsSolution.setEquipmentList(equipments);*/
         ApsSolution solvedBalance  = solver.solve(apsSolution);
         log.info("**************排程评分分析***************");
         SolutionManager<ApsSolution, HardSoftScore> scoreManager = SolutionManager.create(solverFactory);