aps-开工获取设备参数增加工厂筛选

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -205,7 +205,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         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()));
+            ApsCraftEquDo apsCraftEquDo = apsCraftEquService.getOne(new QueryWrapper<ApsCraftEquDo>().lambda().eq(ApsCraftEquDo::getMainid, craftStepDo.getId()).eq(ApsCraftEquDo::getResourceid, apsProcessOperationProcessEquDo.getProcessdeviceid()).eq(ApsCraftEquDo::getTenantid, tenantId));
             if (ObjectUtil.isNotEmpty(apsCraftEquDo)) {
                 equparames = apsCraftEquDo.getEquparames();
             }
@@ -504,7 +504,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         //报工状态
         apsReportRecordsDo.setReportworkstatus("已报工");
         //如过报工时间为空，填入当前时间
-        if(ObjectUtil.isEmpty(apsReportRecordsDo.getReportworktime())){
+        if (ObjectUtil.isEmpty(apsReportRecordsDo.getReportworktime())) {
             apsReportRecordsDo.setReportworktime(DateUtil.date());
         }