From ffb2975ad6ca71f5946969d5a31cff063a402dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 11 Sep 2024 10:10:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BB=8Eexcel=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E5=AF=BC=E5=85=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/service/EBomImportService.java | 2 ++
 .../bomnew/service/domain/EBom/EBomImportExcelCheck.java        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
index 86fbbaed..dee2ed6c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
@@ -260,6 +260,8 @@ public class EBomImportService {
             dto.setUnit("PC");
         }
 
+        dto.setProjectType(StrUtil.trim(dto.getProjectType()));
+
         if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) {
             String id = RandomUtil.randomNumbers(9);
             dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java
index 6bc54f54..f8ff398b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomImportExcelCheck.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum;
 import com.nflg.product.bomnew.pojo.dto.BomNewEBomImportExcelDTO;
-import com.nflg.product.bomnew.pojo.vo.BomNewEbomChildVO;
 import nflg.product.common.constant.STATE;
 
 import java.util.List;
@@ -23,6 +22,7 @@ public class EBomImportExcelCheck {
         List<String> projectTypeList= ProjectTypeInputTypeEnum.ProjectTypeEnum.getAllValue();
         for(BomNewEBomImportExcelDTO dto:list){
 
+            dto.setProjectType(StrUtil.trim(dto.getProjectType()));
             if(Objects.isNull(dto.getProjectType())){
                 error.append(StrUtil.format("第%行,项目类别不能为空",count));
             }else {