|
@@ -936,6 +936,9 @@ public class ApsServiceImpl implements ApsService {
|
|
// List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
|
|
// List<ApsProcessOperationOutMaterDo> outMaterDos = apsProcessOperationOutMaterService.list(new LambdaQueryWrapper<ApsProcessOperationOutMaterDo>()
|
|
// .eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
|
|
// .eq(ApsProcessOperationOutMaterDo::getMainid, processesDo.getId()));
|
|
List<ApsProcessOperationOutMaterDo> outMaterDos = outMaterDosAll.stream().filter(v->v.getMainid().equals(processesDo.getId())).collect(Collectors.toList());
|
|
List<ApsProcessOperationOutMaterDo> outMaterDos = outMaterDosAll.stream().filter(v->v.getMainid().equals(processesDo.getId())).collect(Collectors.toList());
|
|
|
|
+ if(outMaterDos == null || outMaterDos.size() == 0){
|
|
|
|
+ throw new CustomException("坯料计划ID:"+processesDo.getBlankid()+",作业:"+processesDo.getProcess()+",作业名"+processesDo.getProcessname()+" 没有相关输出物料信息!");
|
|
|
|
+ }
|
|
er.setProcessType(processesDo.getProcess());
|
|
er.setProcessType(processesDo.getProcess());
|
|
// 合金+输入物料+宽度+厚度
|
|
// 合金+输入物料+宽度+厚度
|
|
er.setSeriesProduceMark(processesDo.getMetal() + "^_^" + processesDo.getProducttype() + "^_^" + processesDo.getProwidth() + "^_^" + processesDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|
|
er.setSeriesProduceMark(processesDo.getMetal() + "^_^" + processesDo.getProducttype() + "^_^" + processesDo.getProwidth() + "^_^" + processesDo.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
|