From 9f74fa5b19a9c76154a5af18ae77891938f3f356 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, 6 Aug 2024 11:50:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E8=BD=ACpbom=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEsource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/EBomToPBomFor31.java  | 12 +++---------
 .../bomnew/service/domain/EBom/EBomToPbomBase.java   |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
index 41d751f8..a491ebb6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBomFor31.java
@@ -2,26 +2,19 @@ package com.nflg.product.bomnew.service.domain.EBom;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.enums.BooleanEnum;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.google.common.collect.ImmutableList;
-import com.nflg.product.bomnew.constant.ConvertToPBomModelEnum;
-import com.nflg.product.bomnew.constant.EBomConstant;
-import com.nflg.product.bomnew.constant.PBomStatusEnum;
-import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
+import com.nflg.product.bomnew.constant.*;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewPbomParentEntity;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
+import com.nflg.product.bomnew.util.ListCommonUtil;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.nflg.product.bomnew.util.ListCommonUtil;
-
 /**
  * 31码转PBOM
  */
@@ -138,6 +131,7 @@ public class EBomToPBomFor31 extends EBomToPbomBase {
                         childEnt.setParentRowId(parentEnt.getRowId());
                         childEnt.setFacCode(facCode);
                         childEnt.setIdentityNo(StrUtil.join("-", parentEnt.getMaterialNo(), eb.getMaterialNo()));
+                        childEnt.setSource(PbomSourceEnum.FROM_EBOM.getValue());
                         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 affbaf97..b777db0d 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
@@ -220,6 +220,7 @@ public abstract class EBomToPbomBase {
         pBomParent.setDeptName(SessionUtil.getDepartName());
         pBomParent.setDeptRowId(SessionUtil.getDepartRowId());
         pBomParent.setCreatedBy(SessionUtil.getUserCode());
+        pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
         if (Objects.nonNull(oldParent)) {
             oldParent.setExpireEndTime(LocalDateTime.now());
             oldParent.setLastVersionIs(0);