From 9a89d903ccc4aa7951959108e33c28363f3f46da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 6 Jun 2024 09:09:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=90=88=E5=B9=B6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java  | 2 +-
 .../domain/OriginalBom/OriginalBomToEBomV2Convert.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 29355798..b598fb28 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
@@ -945,7 +945,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                 ebomChildService.updateBatchById(bomChildren);
             }
 
-            SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
+//            SpringUtil.getBean(BomNewEbomParentFormalService.class).copyEbomFormal(bomRowId);
 
             CompletableFuture.runAsync(() -> {
                 importToSAP(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 abcc3c6b..f66b5af0 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
@@ -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.getTotalWeight();
                 }
 //                numResult = NumberUtil.add(numResult,  Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
                 numResult = NumberUtil.add(numResult, numNew);

From 3b68e7c76f17d654792cd3c267fd34b0cc7a9069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 6 Jun 2024 09:41:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=90=88=E5=B9=B6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/OriginalBom/OriginalBomToEBomV2Convert.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f66b5af0..a40c0159 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()) {
@@ -121,7 +121,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
                 if( EBomConstant.KG.equalsIgnoreCase(item.getMaterialUnit())){
                     numNew=NumberUtil.mul(item.getTotalWeight(),item.getNum());
                 }else {
-                    numNew= item.getTotalWeight();
+                    numNew= item.getNum();
                 }
 //                numResult = NumberUtil.add(numResult,  Objects.nonNull( item.getNum()) ? item.getNum() : BigDecimal.ZERO);
                 numResult = NumberUtil.add(numResult, numNew);