From 9efab16980a91dd40c2e84e3aa272fd9a97d3ed1 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 16:41:23 +0800
Subject: [PATCH] =?UTF-8?q?EBOM=E7=94=9F=E6=88=90=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E5=8C=85?=
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/EBom/VirtualPackageBase.java | 3 ++-
 2 files changed, 3 insertions(+), 2 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 265ba1a9..f121179b 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
@@ -633,7 +633,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
      * @param paramDto
      */
     @Transactional(rollbackFor = Exception.class)
-    public void generateVirtualPackage(VirtualPackageParamDto paramDto) {
+    public void generateVirtualPackage(VirtualPackageParamDto paramDto)  {
         try {
 
 
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 26db4aa4..87c4a5a0 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
@@ -71,7 +71,8 @@ public abstract class VirtualPackageBase {
         }
         List<AddVirtrualMaterialDTO> addM = params.stream().filter(u -> StrUtil.isBlank(u.getMaterialNo())).collect(Collectors.toList());
         if(CollUtil.isNotEmpty(addM)) {
-            vMNos = SpringUtil.getBean(MaterialService.class).batchAddMaterial(addM);
+            Map<String, AddVirtrualMaterialDTO> vMNosResult = SpringUtil.getBean(MaterialService.class).batchAddMaterial(addM);
+            vMNos.putAll(vMNosResult);
         }
 
     }