调度排程优化

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

@@ -131,15 +131,17 @@ public class TaskStartTimeListenerTa implements ListVariableListener<ApsSolution
         LocalDateTime previousLastEndTime = null;
         if(t.getPreviousProcesses() != null && t.getPreviousProcesses().size()>0){
             for (ProductionProcessesTa previousProcess : t.getPreviousProcesses()) {
-                if(previousProcess.getEquipment() != null && previousProcess.getEquipment().getId().equals(equipmentTa.getId()) && !previousProcess.getIfLock()){
+                /*if(previousProcess.getEquipment() != null && previousProcess.getEquipment().getId().equals(equipmentTa.getId()) && !previousProcess.getIfLock()){
                     continue;
-                }
+                }*/
                 int lzTimes = 0;
                 if(previousProcess.getEquipment() == null){
                     int aa = 0;
                 }
                 if(previousProcess.getEquipment().getWorkshopid() != null && previousProcess.getEquipment().getWorkshopid().equals(equipmentTa.getWorkshopid())){
-                    lzTimes = t.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
+                    if(!previousProcess.getEquipment().getId().equals(equipmentTa.getId())){
+                        lzTimes = t.getApsOverallConfig().getRoamTime().get("WORKSHOP_IN");
+                    }
                 }else if(!previousProcess.getEquipment().getId().equals(equipmentTa.getId())){
                     lzTimes = t.getApsOverallConfig().getRoamTime().get("WORKSHOP_CROSS");
                 }