From a4c4facf3152084ae4bbb23e64752a3ff023c3dc 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, 14 Mar 2024 14:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8Bbom=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E6=98=AF=E2=80=9D=E6=97=A0=E2=80=9C?=
 =?UTF-8?q?=E5=88=99=E6=94=B9=E4=B8=BA=E2=80=9D=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewOriginalParentService.java      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
index 8a726401..4ce3ab3e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java
@@ -10,27 +10,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Sets;
 import com.mzt.logapi.context.LogRecordContext;
-import com.nflg.product.base.core.config.SpringContextUtils;
 import com.nflg.product.base.core.conmon.util.SessionUtil;
-import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.*;
 import com.nflg.product.bomnew.mapper.master.BomNewOriginalParentMapper;
 import com.nflg.product.bomnew.pojo.dto.BomNewOriginalExcelDTO;
 import com.nflg.product.bomnew.pojo.dto.OriginalSaveBomDTO;
-import com.nflg.product.bomnew.pojo.entity.*;
+import com.nflg.product.bomnew.pojo.entity.BomNewOriginalChildEntity;
+import com.nflg.product.bomnew.pojo.entity.BomNewOriginalMaterialUseEntity;
+import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity;
+import com.nflg.product.bomnew.pojo.entity.BomOriginalCadParentEntity;
 import com.nflg.product.bomnew.pojo.query.OriginalBomQuery;
-import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
 import com.nflg.product.bomnew.pojo.vo.BomOriginalPlmBomVO;
 import com.nflg.product.bomnew.pojo.vo.ImportOriginalBomVO;
-import com.nflg.product.bomnew.service.domain.EBom.CheckEBomException;
 import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomDetailTask;
 import com.nflg.product.bomnew.service.domain.OriginalBom.OriginalBomToEBomConvert;
 import com.nflg.product.bomnew.service.domain.OriginalBom.PlmBomToOriginalConvert;
 import com.nflg.product.bomnew.util.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.map.LinkedMap;
-import org.bouncycastle.cert.dane.DANEEntry;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
@@ -46,7 +43,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**
@@ -618,6 +614,9 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         if (data.getChartNo().equals("无")) {
             data.setChartNo("");
         }
+        if (data.getMaterialNo().equals("无")) {
+            data.setMaterialNo("");
+        }
         rowNum.set(rowNum.get() + 1);
 
         excelContextTL.get().add(data);