APS平台生产排程平台规划算法

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/domain/Equipment.java

@@ -53,7 +53,7 @@ public class Equipment extends ApsAbstractPersistable{
     /**
      * 设备所属车间
      */
-    private String workshop;
+    private String workshopname;
 
     /**
      * 设备满负荷物料

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

@@ -86,7 +86,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                         for (ProductionProcesses previousProcess : productionProcesses.getPreviousProcesses()) {
                             // 流转时间
                             Integer lzTimes = 0;
-                            if(previousProcess.getEquipment().getWorkshop() != null && previousProcess.getEquipment().getWorkshop().equals(productionProcesses.getEquipment().getWorkshop())){
+                            if(previousProcess.getEquipment().getWorkshopid() != null && previousProcess.getEquipment().getWorkshopid().equals(productionProcesses.getEquipment().getWorkshopid())){
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
                             }else{
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_CROSS");
@@ -177,7 +177,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                             for (ProductionProcesses previousProcess : productionProcesses.getPreviousProcesses()) {
                                 // 流转时间
                                 Integer lzTimes = 0;
-                                if(previousProcess.getEquipment().getWorkshop() != null && previousProcess.getEquipment().getWorkshop().equals(productionProcesses.getEquipment().getWorkshop())){
+                                if(previousProcess.getEquipment().getWorkshopid() != null && previousProcess.getEquipment().getWorkshopid().equals(productionProcesses.getEquipment().getWorkshopid())){
                                     lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
                                 }else{
                                     lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_CROSS");
@@ -243,7 +243,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
 
                             // 流转时间
                             Integer lzTimes = 0;
-                            if(preProcess.getEquipment().getWorkshop() != null && preProcess.getEquipment().getWorkshop().equals(productionProcesses.getEquipment().getWorkshop())){
+                            if(preProcess.getEquipment().getWorkshopid() != null && preProcess.getEquipment().getWorkshopid().equals(productionProcesses.getEquipment().getWorkshopid())){
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
                             }else{
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_CROSS");
@@ -400,7 +400,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     if(productionProcesses.getPreviousProcesses() != null && productionProcesses.getPreviousProcesses().size()>0){
                         for (ProductionProcesses previousProcess : productionProcesses.getPreviousProcesses()) {
                             Integer lzTimes = 0;
-                            if(previousProcess.getEquipment().getWorkshop() != null && previousProcess.getEquipment().getWorkshop().equals(productionProcesses.getEquipment().getWorkshop())){
+                            if(previousProcess.getEquipment().getWorkshopid() != null && previousProcess.getEquipment().getWorkshopid().equals(productionProcesses.getEquipment().getWorkshopid())){
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
                             }else{
                                 lzTimes = productionProcesses.getApsOverallConfig().getRoamTime().get("WORKSHOP_CROSS");