|
@@ -634,6 +634,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
if(thps != null && thps.size()>0){
|
|
|
// 根据排程时间从大到小排序
|
|
|
Collections.sort(thps,(v1,v2)->v2.getProduceTime().compareTo(v1.getProduceTime()));
|
|
|
+ mergePro = thps.get(0);
|
|
|
for (int i = 0; i < thps.size(); i++) {
|
|
|
if(i>0){
|
|
|
// 设置待合并退火的主ID
|
|
@@ -714,6 +715,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
if(thps.get(i).getProcessType().equals("小卷成退")){
|
|
|
thps.get(0).setMinThPcNum(thps.get(0).getMinThPcNum()+thps.get(i).getMinThPcNum());
|
|
|
}
|
|
|
+ mergePro.setTotalSinglerollweight(mergePro.getTotalSinglerollweight().add(thps.get(i).getTotalSinglerollweight()));
|
|
|
// 排程排序字段重新设置,取最小的排序字段值
|
|
|
if(thps.get(i).getOrderMark()<thps.get(0).getOrderMark()){
|
|
|
thps.get(0).setOrderMark(thps.get(i).getOrderMark());
|
|
@@ -724,9 +726,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
}
|
|
|
}
|
|
|
// 取第一个作业作为合并作业
|
|
|
- mergePro = thps.get(0);
|
|
|
mergePro.setVolumeWidth(mergePro.getVolumeWidth().multiply(new BigDecimal(thps.size())));
|
|
|
- mergePro.setSinglerollweight(mergePro.getSinglerollweight().multiply(new BigDecimal(thps.size())));
|
|
|
mergePro.setOpeProducePcNum(thps.size());
|
|
|
|
|
|
// 重新设置前道工序的排序字段值
|