From d4803fdfb429c35312148988efc5b42f17846e98 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sat, 30 Mar 2024 17:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 6779e1dd..39959f4a 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
@@ -661,7 +661,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             BomNewEbomParentVO parent = Convert.convert(BomNewEbomParentVO.class, root);
             materialMainService.intiMaterialInfo(ImmutableList.of(parent), BomNewEbomParentVO::getMaterialNo);
-            if (parent.getMaterialCategoryCode().startsWith("30") || parent.getMaterialCategoryCode().equals("200401")) {
+            if (parent.getMaterialCategoryCode().startsWith("30") || ImmutableList.of("200601","200401").contains(parent.getMaterialCategoryCode())) {
                 VirtualPackageBase generate;
                 if (parent.getMaterialCategoryCode().startsWith("30")) {
                     generate = new VirtualPackageFor31(paramDto.getBomRowId(), paramDto.getVirtualPackageValue());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
index 068f6fb6..3341e79e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/BaseConvert.java
@@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service.domain.OriginalBom;
 
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -127,6 +128,7 @@ public abstract class BaseConvert {
         parentEntity.setCreatedBy(SessionUtil.getUserCode());
         parentEntity.setCreatedTime(LocalDateTime.now());
         parentEntity.setShouldBomExist(material.getShouldBomExist());
+        parentEntity.setTotalWeight(NumberUtil.mul(parentEntity.getUnitWeight(),parentEntity.getNum()) );
 
         if  (StrUtil.isNotBlank(material.getMaterialCategoryCode()) &&(material.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE) || material.getMaterialCategoryCode().startsWith("30") ||
                 (  material.getMaterialCategoryCode().startsWith("20") && material.getMaterialGetType().equals(MaterialGetEnum.developing.getValue())))){
@@ -156,6 +158,7 @@ public abstract class BaseConvert {
         childEntity.setCreatedBy(SessionUtil.getUserCode());
         childEntity.setRemark(material.getRemark());
         childEntity.setShouldBomExist(material.getShouldBomExist());
+        childEntity.setTotalWeight(NumberUtil.mul(childEntity.getUnitWeight(),childEntity.getNum()));
         this.resultChild.add(childEntity);
         return childEntity;