From a7c1b7427299615ea7b3a99a14d8aa38d461c937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 9 May 2024 08:11:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E7=94=B5=E6=B0=94bom):=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=88=99=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/service/DQBomImportService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
index 7bc5d559..69642e0c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
@@ -379,6 +379,9 @@ public class DQBomImportService {
             dQbomExcelVO.setProjectType(BomConstant.PROJECT_TYPE_TEMPORARY);
         }
         dQbomExcelVO.setCurrentVersion("");
+        if (StrUtil.isBlank(dQbomExcelVO.getProjectType())) {
+            dQbomExcelVO.setProjectType("L");
+        }
 
         excelContextTL.get().add(dQbomExcelVO);
     }

From 4251feac9ba548636730d3712e2546c15fc7d174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 9 May 2024 08:15:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E5=AF=BC=E5=85=A5=E5=88=B0sap):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE=E5=AF=BC=E5=85=A5sap?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java     | 6 ++++--
 .../product/bomnew/service/BomNewMbomParentService.java     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 ea2b49ec..241cb170 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
@@ -405,6 +405,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                             child.setCurrentVersion(OriginalConstant.DEFAULT_BOM_VERSION);
                         }
                     }
+                    child.setChildBomRowId(child.getRowId());
                 }
             }
         }
@@ -965,7 +966,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
     private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
         lambdaUpdate().eq(BomNewEbomParentEntity::getRowId, rootBomRowId)
                 .set(BomNewEbomParentEntity::getSapTime, LocalDateTime.now())
-                .set(BomNewEbomParentEntity::getSapState, sapState)
+                .set(BomNewEbomParentEntity::getSapState, sapState.getValue())
                 .update();
     }
 
@@ -1566,7 +1567,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             parentVO.setBomRowId(parentVO.getRowId());
             parentVO.setProjectType(projectType);
-            parentVO.setParentRowId(0l);
+            parentVO.setParentRowId(0L);
+            parentVO.setChildBomRowId(rowId);
             materialMainService.intiMaterialInfo(ImmutableList.of(parentVO), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
             vo.setDatas(getChild(bomRowId));
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
index e261651a..d235567b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java
@@ -319,7 +319,7 @@ public class BomNewMbomParentService extends ServiceImpl<BomNewMbomParentMapper,
     private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
         lambdaUpdate().eq(BomNewMbomParentEntity::getRowId, rootBomRowId)
                 .set(BomNewMbomParentEntity::getSysnSapTime, LocalDateTime.now())
-                .set(BomNewMbomParentEntity::getStatus, sapState)
+                .set(BomNewMbomParentEntity::getStatus, sapState.getValue())
                 .update();
     }
 }