冷轧调度异常数据兼容

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

@@ -267,6 +267,11 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
                         }
                     }
                 }
+                if(equipments == null || equipments.size() == 0){
+                    List<EquipmentTa> kkequs = apsSolution.getEquipmentList().stream().filter(v -> kkeqs.contains(v.getId())).collect(Collectors.toList());
+                    equipments = kkequs;
+                }
+
                 // 排序按照宽度从大到小排序
                 List<ProductionProcessesTa> toApsPros = vv;
                 Collections.sort(toApsPros,(p1,p2)->{
@@ -1191,7 +1196,7 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
             // 可选设备初始化
             // 调度排程时如果存在历史排程设备，则可选设备直接替换为历史设备
             if(StrUtil.isNotBlank(process.getLastHistoryEquipmentId()) && "dd".equals(productionScheduleVo.getScheduleType().getScheduleType())
-                    && !"notThMergeBf".equals(productionScheduleVo.getScheduleType().getThMergeMode())){
+                    && "notThMergeBf".equals(productionScheduleVo.getScheduleType().getThMergeMode())){
                 List<String> hisEqIds = new ArrayList<>();
                 hisEqIds.add(process.getLastHistoryEquipmentId());
                 process.setOptionalEquipments(hisEqIds);