调度冷轧连续排程优化、以及铸轧重叠bug修改

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

@@ -2510,7 +2510,7 @@ public class ApsServiceImpl implements ApsService {
             for (ProductionProcesses productionProcesses : zzprocesList) {
                 String cplx = productionProcesses.getProducttype().split("-")[0];
                 // 客户订单ID+合金+产品类型+宽度 作为合并的key
-                String keystr = productionProcesses.getProduceOrder().get(0).getCustomerOrderId()+productionProcesses.getVolumeMetal()+cplx+productionProcesses.getVolumeWidth();
+                String keystr = productionProcesses.getProduceOrder().get(0).getCustomerOrderId()+productionProcesses.getVolumeMetal()+productionProcesses.getProducttype()+cplx+productionProcesses.getVolumeWidth();
                 if(bsPros.containsKey(keystr)){
                     bsPros.get(keystr).add(productionProcesses);
                 }else{

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

@@ -1467,9 +1467,9 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 process.setCutfinishmin(0);
             }
             // 锁定工序处理
-            /*if(process.getIfLock() && process.getOptionalProviderEquipments().size()>0){
+            if(process.getIfLock() && process.getOptionalProviderEquipments().size()>0){
                 process.setIfLock(false);
-                int ai = -1;
+                /*int ai = -1;
                 if(process.getOptionalProviderEquipments().get(0).getEquipmentRunTimes() != null
                         && process.getOptionalProviderEquipments().get(0).getEquipmentRunTimes().size()>0){
                     for (int i = 0; i < process.getOptionalProviderEquipments().get(0).getEquipmentRunTimes().size(); i++) {
@@ -1481,11 +1481,11 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 }
                 if(ai>-1){
                     process.getOptionalProviderEquipments().get(0).getEquipmentRunTimes().remove(ai);
-                }
+                }*/
                 // 锁定工序的设备即可选设备
                 process.setEquipment(process.getOptionalProviderEquipments().get(0));
                 process.setIfLock(true);
-            }*/
+            }
             // 特殊冲突约束Map初始化
             process.setConflictRoptions(new ConcurrentHashMap<>());
             // 唯一作业ID设值