From da5fcd54cf149d2155dd6499fad59292591976f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 3 Jun 2024 14:04:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=ACPBOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/domain/EBom/EBomToPBom.java   | 3 ++-
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
index 088001dc..ee90fb02 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
@@ -71,10 +71,11 @@ public class EBomToPBom extends EBomToPbomBase {
                     //合并子级
                     for (BomNewEbomParentVO eb : mergeChild) {
                         BomNewPbomChildEntity childEnt = new BomNewPbomChildEntity();
-                        BeanUtil.copyProperties(eb, childEnt);
+                        BeanUtil.copyProperties(eb, childEnt,"sourceRowId");
                         childEnt.setRowId(IdWorker.getId());
                         childEnt.setParentRowId(parentEnt.getRowId());
                         childEnt.setFacCode(facCode);
+                        childEnt.setSourceRowId(eb.getRowId());
                         childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
                         this.pBomChildResult.add(childEnt);
                     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index b4eac712..8660b2d3 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -116,7 +116,7 @@ public abstract class EBomToPbomBase {
         for (String key : listMp.keySet()) {
             List<BomNewEbomParentVO> voList = listMp.get(key);
             BomNewEbomParentVO ent = voList.get(0);
-            ent.setNum(voList.stream().map(aa -> aa.getNum()).reduce(BigDecimal.ZERO, BigDecimal::add));
+            ent.setNum(voList.stream().filter(u->Objects.nonNull(u.getNum())).map(aa ->  aa.getNum()).reduce(BigDecimal.ZERO, BigDecimal::add));
             result.add(ent);
         }
         return result;
@@ -155,7 +155,7 @@ public abstract class EBomToPbomBase {
             return oldParent;
         } else {
             BomNewPbomParentEntity pBomParent = new BomNewPbomParentEntity();
-            BeanUtil.copyProperties(parentVo, pBomParent);
+            BeanUtil.copyProperties(parentVo, pBomParent,"sourceRowId");
             pBomParent.setSourceRowId(parentVo.getBomRowId());
             pBomParent.setRowId(IdWorker.getId());
             pBomParent.setStatus(PBomStatusEnum.WAIT_PUBLISH.getValue());