From d597bed3b67e4941a1bc8b77151663ab06c33d92 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, 21 Jun 2024 09:40:36 +0800
Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E4=BB=8Ecad=E5=92=8Cexcel?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=EF=BC=8C=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=9B=BE=E5=8F=B7=E5=8E=BB=E9=99=A4=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=A9=BA=E6=A0=BC=EF=BC=8C=E4=BB=A5=E5=85=8D=E4=BB=8E?=
 =?UTF-8?q?=E4=B8=BB=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewOriginalParentV2Service.java | 4 ++++
 .../com/nflg/product/bomnew/service/EBomImportService.java    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
index dff39a38..08567885 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
@@ -114,8 +114,12 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
 
 
         VUtils.isTure(CollUtil.isEmpty(parents)).throwMessage("没有你的数据，你无需转换");
+        //物料编号去除前后空格
+        parents.parallelStream().forEach(u -> u.setMaterialNo(StrUtil.trim(u.getMaterialNo())));
         //检查物料编码在主数据中是否存在
         List<BomOriginalCadChildEntity> childs = originalCadChildService.lambdaQuery().in(BomOriginalCadChildEntity::getParentRowId, parents.stream().map(u -> u.getRowId()).collect(Collectors.toList())).list();
+        //物料编号去除前后空格
+        childs.parallelStream().forEach(u -> u.setMaterialNo(StrUtil.trim(u.getMaterialNo())));
         checkMaterialHasExist(parents.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(BomOriginalCadParentEntity::getMaterialNo).collect(Collectors.toList()));
         checkMaterialHasExist(childs.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(BomOriginalCadChildEntity::getMaterialNo).collect(Collectors.toList()));
 
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 db42d602..326134db 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
@@ -261,6 +261,9 @@ public class EBomImportService {
             }
         }
 
+        dto.setMaterialNo(StrUtil.trim(dto.getMaterialNo()));
+        dto.setDrawingNo(StrUtil.trim(dto.getDrawingNo()));
+
         excelContextTL.get().add(dto);
     }