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 42a55bc9..e1d21e00 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
@@ -942,7 +942,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 ebomChildService.updateBatchById(bomChildren);
             }
 
-            SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
+//            SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
         }
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
index 9b98f419..b4faa4e0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
@@ -107,7 +107,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 
         List<BomOriginalListVO> result = new ArrayList();
         //子级中，一般零部件
-        List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| u.getRegReplaceIs().equals(1))).collect(Collectors.toList());
+        List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) &&  u.getRegReplaceIs().equals(1)).collect(Collectors.toList());
 
         Map<String, List<BomOriginalListVO>> materialNoGroupMp =commonPartList.stream().collect(Collectors.groupingBy(BomOriginalListVO::getMaterialNo));
         for (Map.Entry<String, List<BomOriginalListVO>> entry : materialNoGroupMp.entrySet()) {
@@ -119,9 +119,9 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
             for (BomOriginalListVO item : list1) {
                 BigDecimal numNew=BigDecimal.ZERO;
                 if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
-                    numNew= item.getTotalWeight();
-                }else {
                     numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
+                }else {
+                    numNew= item.getNum();
                 }
 //                numResult = NumberUtil.add(numResult,  Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
                 numResult = NumberUtil.add(numResult, numNew);