From 3ff75130f6d85338ad3a35c69ac19523266cf51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 24 Jun 2024 18:41:16 +0800 Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E4=BB=8Ecad=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=BC=96=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E6=97=A0=E2=80=9D=EF=BC=8C=E5=88=99=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewOriginalParentV2Service.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 08567885..2bc26989 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 @@ -115,11 +115,21 @@ public class BomNewOriginalParentV2Service extends ServiceImpl u.setMaterialNo(StrUtil.trim(u.getMaterialNo()))); + parents.parallelStream().forEach(u -> { + u.setMaterialNo(StrUtil.trim(u.getMaterialNo())); + if (StrUtil.equals(u.getMaterialNo(), "无")) { + u.setMaterialNo(""); + } + }); //检查物料编码在主数据中是否存在 List 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()))); + childs.parallelStream().forEach(u -> { + u.setMaterialNo(StrUtil.trim(u.getMaterialNo())); + if (StrUtil.equals(u.getMaterialNo(), "无")) { + u.setMaterialNo(""); + } + }); 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()));