diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
index 35887dcf..674aecec 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java
@@ -114,9 +114,9 @@ public class OriginalBomApi extends BaseApi {
     @Transactional(rollbackFor = Exception.class)
     @LogRecord(success = "从cad获取bom到原始BOM,操作结果:{{#_ret}}",
             bizNo = "" ,type = "从CAD获取BOM数据")
-    public ResultVO<List<ImportOriginalBomVO>> pullFromPlm() {
+    public ResultVO<List<ImportOriginalBomVO>> pullFromCad() {
 
-        List<ImportOriginalBomVO> result = originalParentService.pullFromPlm(SessionUtil.getUserCode());
+        List<ImportOriginalBomVO> result = originalParentService.pullFromCad(SessionUtil.getUserCode());
 
         originalParentService.computeLevelNumAndRootState();
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 7ba75293..4775a037 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -402,7 +402,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
      * @param
      */
     @Transactional(rollbackFor = Exception.class)
-    public List<ImportOriginalBomVO> pullFromPlm(String userCode) {
+    public List<ImportOriginalBomVO> pullFromCad(String userCode) {
 
         List<BomOriginalCadParentEntity> parents = originalCadParentService.lambdaQuery().eq(BomOriginalCadParentEntity::getStatus, 1).eq(BomOriginalCadParentEntity::getCreatedBy, userCode).list();
         VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据，你无需转换");
@@ -420,8 +420,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         if (CollUtil.isNotEmpty(convert.getResultChild())) {
             originalChildService.saveOrUpdateBatch(convert.getResultChild());
         }
-        //删除plm临时表数据
-        List<Integer> delRowIds = parents.stream().map(u -> u.getRowId()).collect(Collectors.toList());
+        //删除cad临时表数据
+        List<Integer> delRowIds = parents.stream().map(BomOriginalCadParentEntity::getRowId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(delRowIds)) {
             originalCadParentService.getBaseMapper().deleteBatchIds(delRowIds);
             originalCadParentService.getBaseMapper().delChildByParentRowIds(delRowIds);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
index 1e641f15..23118d43 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvert.java
@@ -47,9 +47,15 @@ public class PlmBomToOriginalConvert extends BaseConvert {
         childs = Convert.toList(BomOriginalPlmBomVO.class, SpringUtil.getBean(BomOriginalCadChildService.class).lambdaQuery().eq(BomOriginalCadChildEntity::getParentRowId, inParent.getRowId()).list());
         parent = Convert.convert(BomOriginalPlmBomVO.class, inParent);
         //图号-初始化缺编码的物料
-        if(StrUtil.isBlank(parent.getMaterialNo()) || parent.getMaterialNo().trim().equalsIgnoreCase("无")){
+        if(parent.getMaterialNo().trim().equalsIgnoreCase("无")){
+            parent.setMaterialNo("");
+        }
+        if(StrUtil.isBlank(parent.getMaterialNo())){
             SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(ImmutableList.of(parent) ,BomOriginalPlmBomVO::getDrawingNo,BomOriginalPlmBomVO::setMaterialNo,BomOriginalPlmBomVO::setMaterialName);
         }
+        childs.stream().filter(f->f.getMaterialNo().trim().equalsIgnoreCase("无")).forEach(it->{
+            it.setMaterialNo("");
+        });
         List<BomOriginalPlmBomVO> noMaterialNoList = childs.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
         if(CollUtil.isNotEmpty(noMaterialNoList)){
             SpringUtil.getBean(MaterialMainService.class).initMaterialForDrawdingNo(noMaterialNoList ,BomOriginalPlmBomVO::getDrawingNo,BomOriginalPlmBomVO::setMaterialNo,BomOriginalPlmBomVO::setMaterialName);