From 436d6d44808210ded50343c94d8e3f148812c956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 9 Apr 2024 08:43:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8Bbom?=
 =?UTF-8?q?=E8=BD=ACebom=E5=90=8E=EF=BC=8C=E5=AD=90=E7=BA=A7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=80=BB=E9=87=8D=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/BomNewOriginalChildEntity.java    | 15 +++++++--------
 .../service/BomNewOriginalParentService.java      |  4 +++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
index d2fd6cbc..b403de79 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
@@ -1,19 +1,18 @@
 package com.nflg.product.bomnew.pojo.entity;
 
-import java.math.BigDecimal;
-
 import cn.hutool.core.util.NumberUtil;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
 
 /**
  * t_bom_new_original_child
@@ -136,7 +135,7 @@ public class BomNewOriginalChildEntity implements Serializable {
     private Long bomVersionRowId;
 
     public BigDecimal getTotalWeight() {
-        return NumberUtil.mul(this.getUnitWeight(), this.num);
+        return NumberUtil.mul(this.unitWeight, this.num);
     }
 
     private static final long serialVersionUID = -61829104329368344L;
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 57e95ae5..59259f21 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
@@ -564,7 +564,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
             //原始BOM-同步到历史表
             CompletableFuture.runAsync(() -> {
                 syncToFormal(convert.getHasHandlerParentIds());
-            },syncOriginalBomToFormalPool );
+            }, syncOriginalBomToFormalPool);
         }
 
         //记录子级BOM版本行ID
@@ -573,6 +573,8 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
             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)) {