From d769eb7de3da1339c8dc32cce039ec2446a761e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 15 Mar 2024 14:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewOriginalParentService.java   | 4 +---
 1 file changed, 1 insertion(+), 3 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 602ca6e1..3d577a35 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
@@ -598,8 +598,6 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
                 if (CollUtil.isNotEmpty(convert.getResultChild())) {
                     originalChildService.saveOrUpdateBatch(convert.getResultChild());
                 }
-            }else{
-                errResult.add(new ImportOriginalBomVO(data.getChartNo(),"没有子节点，不导入"));
             }
             errResult.addAll(convert.getImportErrorResult());
         }
@@ -616,7 +614,7 @@ public class BomNewOriginalParentService extends ServiceImpl<BomNewOriginalParen
         if (data.getChartNo().equals("无")) {
             data.setChartNo("");
         }
-        if (data.getMaterialNo().equals("无")) {
+        if (data.getMaterialNo()!=null && "无".contentEquals(StrUtil.trim(data.getMaterialNo()))) {
             data.setMaterialNo("");
         }
         rowNum.set(rowNum.get() + 1);