|
@@ -199,9 +199,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
//查询此工序对应工艺步骤中,对应设备的设备参数
|
|
|
String equparames = "";
|
|
|
//查询工序步骤
|
|
|
- String process = apsProcessOperationDo.getProcess();
|
|
|
- String processname = apsProcessOperationDo.getProcessname();
|
|
|
- ApsCraftStepDo craftStepDo = apsCraftStepService.getOne(new QueryWrapper<ApsCraftStepDo>().lambda().eq(ApsCraftStepDo::getProcess, process).eq(ApsCraftStepDo::getProcessname, processname));
|
|
|
+// String process = apsProcessOperationDo.getProcess();
|
|
|
+// String processname = apsProcessOperationDo.getProcessname();
|
|
|
+ String stepnum = apsProcessOperationDo.getStepnum();
|
|
|
+ ApsCraftStepDo craftStepDo = apsCraftStepService.getOne(new QueryWrapper<ApsCraftStepDo>().lambda().eq(ApsCraftStepDo::getStepnum, stepnum));
|
|
|
if (ObjectUtil.isNotEmpty(craftStepDo)) {
|
|
|
//查询设备参数子表
|
|
|
ApsCraftEquDo apsCraftEquDo = apsCraftEquService.getOne(new QueryWrapper<ApsCraftEquDo>().lambda().eq(ApsCraftEquDo::getMainid, craftStepDo.getId()).eq(ApsCraftEquDo::getResourceid, apsProcessOperationProcessEquDo.getProcessdeviceid()));
|