|
|
@@ -1,8 +1,11 @@
|
|
|
package com.rongwei.rwapsserver.aps.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.rongwei.rwapsserver.aps.domain.ApsOverallConfig;
|
|
|
import com.rongwei.rwapsserver.aps.domain.ApsSolution;
|
|
|
+import com.rongwei.rwapsserver.aps.domain.Equipment;
|
|
|
import com.rongwei.rwapsserver.aps.domain.ProductionProcesses;
|
|
|
import com.rongwei.rwapsserver.aps.score.ApsConstraintProvider;
|
|
|
import com.rongwei.rwapsserver.aps.service.DdApsService;
|
|
|
@@ -824,8 +827,17 @@ public class DdApsServiceImpl implements DdApsService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // 判断是否可合并
|
|
|
+ boolean notMerge = true;
|
|
|
+ // 后端工序只有一个，前道工序有多个不能合并
|
|
|
+ if(nextProcesses != null && nextProcesses.size()>0){
|
|
|
+ if(nextProcesses.size() == 1 && nextProcesses.get(0).getPreviousProcesses().size()>1){
|
|
|
+ notMerge = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if("否".equals(rootPro.getIssubsection()) && ("冷轧".equals(rootPro.getProcessType()) || "箔轧".equals(rootPro.getProcessType()))
|
|
|
- && !rootPro.getIfLock() && issameg){
|
|
|
+ && !rootPro.getIfLock() && issameg && notMerge){
|
|
|
// 是否连续冷轧、箔轧
|
|
|
boolean hasSeries = false;
|
|
|
if(StrUtil.isNotBlank(seriesKey) && StrUtil.isNotBlank(protype) && protype.equals(rootPro.getProcessType())
|
