diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java
index c0d60d23..47992feb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java
@@ -29,7 +29,7 @@ public class QueryMaterialsVO extends BaseMaterialVO implements Serializable {
      * 设计维护部门名称
      */
     @ApiModelProperty(value = "设计维护部门名称")
-    private String deptName = SessionUtil.getFullDeptName();
+    private String deptName = SessionUtil.getDepartName();
 
     /**
      * 创建时间
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 11d50f05..8bd8af1a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2384,7 +2384,23 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         if (CollUtil.isNotEmpty(keys)) {
             datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys));
         }
-        return Convert.toList(QueryMaterialsVO.class, datas);
+        List<QueryMaterialsVO> vos = Convert.toList(QueryMaterialsVO.class, datas);
+        query.forEach(it -> {
+            if (Objects.nonNull(it.getUnitWeight()) || StrUtil.isNotBlank(it.getProjectType())) {
+                QueryMaterialsVO vo = vos.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), it.getMaterialNo())
+                                || StrUtil.equals(m.getDrawingNo(), it.getDrawingNo()))
+                        .findFirst().orElse(null);
+                if (Objects.nonNull(vo)) {
+                    if (Objects.nonNull(it.getUnitWeight())) {
+                        vo.setUnitWeight(it.getUnitWeight());
+                    }
+                    if (StrUtil.isNotBlank(it.getProjectType())) {
+                        vo.setProjectType(it.getProjectType());
+                    }
+                }
+            }
+        });
+        return vos;
     }
 
     public BomNewEbomParentEntity getLatestByMaterialNo(String materialNo) {