From 42761eee035ab038a32eb6b51ee2bc016e76edc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Fri, 17 May 2024 14:14:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=BF=E6=8D=A2=E9=A1=B9=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewOriginalParentV2Service.java     | 14 --------------
 .../OriginalBom/OriginalBomToEBomV2Convert.java    |  3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
index a304b930..09515441 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
@@ -210,20 +210,6 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
             }, syncOriginalBomToFormalPool);
         }
 
-        //记录子级BOM版本行ID
-        List<BomNewOriginalChildEntity> originalChildEntities = new ArrayList<>();
-        bomAllChildList.forEach(k -> {
-            BomNewOriginalChildEntity entChild = new BomNewOriginalChildEntity();
-            entChild.setRowId(k.getRowId());
-            entChild.setBomVersionRowId(k.getBomRowId());
-            entChild.setNum(k.getNum());
-            entChild.setUnitWeight(k.getUnitWeight());
-            originalChildEntities.add(entChild);
-        });
-        if (CollUtil.isNotEmpty(originalChildEntities)) {
-            originalChildService.updateBatchById(originalChildEntities);
-        }
-
     }
 
     /**
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 553cffc1..d9a07c2e 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
@@ -106,7 +106,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
 
         List<BomOriginalListVO> result = new ArrayList();
         //子级中，一般零部件
-        List<BomOriginalListVO> commonPartList = list.stream().filter(u -> StrUtil.isBlank(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()) && (OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE.equals(u.getMaterialCategoryCode())|| 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()) {
@@ -301,7 +301,6 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
             parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc());
             parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
             parentEntity.setMaterialUnit("KG");
-            parentEntity.setNum(parentEntity.getTotalWeight());
             parentEntity.setProjectType("L");
             parentEntity.setRegReplaceIs(1);
         } else {