diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
index 0d5d9e84..5d9781f7 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomForwardReport.java
@@ -73,8 +73,9 @@ public class EBomForwardReport extends BaseForwardReport {
 
     public void buildQueryParam(QueryWrapper<? extends BomNewEbomParentEntity> queryWrapper) {
 
-        queryWrapper.eq(FieldGetterUtil.getFieldInfo(BomNewEbomParentEntity::getMaterialNo), query.getMaterialNo());
-        if (StrUtil.isNotBlank(query.getDrawingNo())) {
+        queryWrapper.eq(StrUtil.isNotBlank(query.getMaterialNo()) , FieldGetterUtil.getFieldInfo(BomNewEbomParentEntity::getMaterialNo), query.getMaterialNo());
+        //物料编码优先查询（有物料编码以物料编码为准）
+        if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isNotBlank(query.getDrawingNo())) {
             queryWrapper.eq(FieldGetterUtil.getFieldInfo(BomNewEbomParentEntity::getDrawingNo), query.getDrawingNo());
         }
         if (query.getVersionStrategy().compareTo(ReportConstant.VersionStrategyEnum.DEFINE.getValue()) == 0) {