From ae56989682a515e57a6f14eb0706dc1f20c23a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 16 May 2024 10:15:47 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=80=E8=88=AC=E9=9B=B6=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BAL=202=20=20=E6=9B=BF=E6=8D=A2=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E9=BB=98=E8=AE=A4=E4=B8=BA?=
 =?UTF-8?q?L?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/domain/OriginalBom/OriginalBomToEBomV2Convert.java  | 2 ++
 .../service/domain/OriginalBom/PlmBomToOriginalConvertV2.java   | 1 +
 2 files changed, 3 insertions(+)

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 d832505a..de07bf2e 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
@@ -297,6 +297,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
             parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
             parentEntity.setMaterialUnit("KG");
             parentEntity.setNum(parentEntity.getTotalWeight());
+            parentEntity.setProjectType("L");
         } else {
             parentEntity.setMaterialDesc(parentEntity.getMaterialName());
         }
@@ -340,6 +341,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
         childEntity.setNum(parent.getUnitWeight());
         childEntity.setCreatedBy(SessionUtil.getUserCode());
         childEntity.setMaterialUnit("KG");
+        childEntity.setProjectType("L");
 
         // this.eBomChildResult.add(childEntity);
         return childEntity;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java
index 4c4f331b..5610c468 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java
@@ -198,6 +198,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
                 parentEntity.setMaterialName(baseMaterialVO.getMaterialName());
                 parentEntity.setMaterialDesc(baseMaterialVO.getMaterialDesc());
                 parentEntity.setMaterialTexture(baseMaterialVO.getMaterialTexture());
+                parentEntity.setProjectType("L");
             }
 
         }