|
|
@@ -278,7 +278,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
equipment.setLastProcessEndTime(lastpro.getPlanenddate());
|
|
|
equipment.setLastProcessCutfinishmin(lastop.getCutfinishmin() == null ? null : lastop.getCutfinishmin().intValue());
|
|
|
// 合金+输入物料+宽度+厚度+输出物料厚度
|
|
|
- equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getPlaninput() + "^_^" + lastop.getProwidth() + "^_^" + lastop.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
+ equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getProducttype() + "^_^" + lastop.getProwidth() + "^_^" + lastop.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
equipment.setLastProcessCutfinishmin(lastop.getCutfinishmin() == null ? null : lastop.getCutfinishmin().intValue());
|
|
|
}
|
|
|
// 查询相关工序作业
|
|
|
@@ -309,7 +309,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
.eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
|
|
|
er.setProcessType(processesDo.getProcess());
|
|
|
// 合金+输入物料+宽度+厚度
|
|
|
- er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
+ er.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProducttype() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
er.setPrepressworkmin(processesDo.getPrepressworkmin() == null ? null : processesDo.getPrepressworkmin().intValue());
|
|
|
er.setCutfinishmin(processesDo.getCutfinishmin() == null ? null : processesDo.getCutfinishmin().intValue());
|
|
|
// 单卷宽度、重量数据赋值
|
|
|
@@ -467,7 +467,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
processes.setVolumeMetal(operationDo.getMetal());
|
|
|
// 连续生产标识设置
|
|
|
// 合金+输入物料+宽度+输入物料厚度+输出物料厚度（取第一个冷轧工序使用）
|
|
|
- processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getPlaninput() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
+ processes.setSeriesProduceMark(operationDo.getMetal() + "^_^" + operationDo.getProducttype() + "^_^" + operationDo.getProwidth() + "^_^" + operationDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
|
processes.setPrepressworkmin(operationDo.getPrepressworkmin() == null ? null : operationDo.getPrepressworkmin().intValue());
|
|
|
processes.setCutfinishmin(operationDo.getCutfinishmin() == null ? null : operationDo.getCutfinishmin().intValue());
|
|
|
// 锁定的作业加上锁定标识
|
