From 4e4cd647ba48d1f8e7190423243abc9a202514d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 26 Feb 2024 11:10:01 +0800
Subject: [PATCH] =?UTF-8?q?eBOM-=E5=8F=8D=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java | 1 +
 .../nflg/product/bomnew/service/ReverseReportService.java    | 4 ++--
 .../bomnew/service/domain/EBom/VirtualPackageBase.java       | 5 ++++-
 3 files changed, 7 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 6097953c..265ba1a9 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
@@ -632,6 +632,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      *
      * @param paramDto
      */
+    @Transactional(rollbackFor = Exception.class)
     public void generateVirtualPackage(VirtualPackageParamDto paramDto) {
         try {
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ReverseReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ReverseReportService.java
index 27a73950..783f4061 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ReverseReportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ReverseReportService.java
@@ -98,7 +98,7 @@ public class ReverseReportService {
             List<BomNewEbomParentVO> parentEntChild = bomDetail.stream().filter(u -> u.getParentRowId().equals(parentEnt.getBomRowId())).collect(Collectors.toList());
             for (BomNewEbomParentVO child :parentEntChild) {
                 String key= joiner.join(eBomIndexPrefix, child.getMaterialNo(),child.getCurrentVersion());
-                String value=joiner.join(eBomIndexPrefix , parentEnt.getMaterialNo(),parentEnt.getCurrentVersion());
+                String value=joiner.join("_", parentEnt.getMaterialNo(),parentEnt.getCurrentVersion());
                 redisService.addSet(key,value);
             }
         }
@@ -116,7 +116,7 @@ public class ReverseReportService {
             List<BomNewPbomParentVO> parentEntChild = bomDetail.stream().filter(u -> u.getParentRowId().equals(parentEnt.getBomRowId())).collect(Collectors.toList());
             for (BomNewPbomParentVO child :parentEntChild) {
                 String key= joiner.join(pBomIndexPrefix, child.getMaterialNo(),child.getCurrentVersion());
-                String value=joiner.join(pBomIndexPrefix , parentEnt.getMaterialNo(),parentEnt.getCurrentVersion());
+                String value=joiner.join("_" , parentEnt.getMaterialNo(),parentEnt.getCurrentVersion());
                 redisService.addSet(key,value);
             }
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
index c7e509a4..26db4aa4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
@@ -70,7 +70,9 @@ public abstract class VirtualPackageBase {
             }
         }
         List<AddVirtrualMaterialDTO> addM = params.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
-        vMNos= SpringUtil.getBean(MaterialService.class).batchAddMaterial(addM);
+        if(CollUtil.isNotEmpty(addM)) {
+            vMNos = SpringUtil.getBean(MaterialService.class).batchAddMaterial(addM);
+        }
 
     }
 
@@ -106,6 +108,7 @@ public abstract class VirtualPackageBase {
             ent.setMaterialName(oldMaterialList.get(0).getMaterialName());
             ent.setMaterialDesc(oldMaterialList.get(0).getMaterialDesc());
             ent.setMaterialCategoryCode(oldMaterialList.get(0).getMaterialCategoryCode());
+            vMNos.put(ent.getKey(),ent);
         }
         else {
             ent.setKey(key);