diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index 5ab0a0f8..f5c10f18 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -96,13 +96,14 @@ public class OptionalEbomImportChildService extends ServiceImpl listNo = StrUtil.splitTrim(strMaterial,";"); + listNo = listNo.stream().filter(str -> !str.trim().replace(" ","").isEmpty()).collect(Collectors.toList()); + List materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForMaterialNo(listNo); if (CollectionUtil.isEmpty(materialListVo)) { throw new NflgBusinessException(STATE.BusinessError, "未查询到物料相关数据"); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java index 964e32c5..fcbb176f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java @@ -122,6 +122,13 @@ public class AggregOptionConfigService { } OptionalEbomConfigAggregVO optionalEbomConfigAggregVO = new OptionalEbomConfigAggregVO(); + + try{ + Collections.sort(listParent, (option0, option1) -> option0.getOptionDrawingNo().compareTo(option1.getOptionDrawingNo())); + }catch (Exception e){ + + } + optionalEbomConfigAggregVO.setSingleList(listParent); if (CollectionUtil.isEmpty(mulList)) {