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()));