rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

选项排序升序

This commit is contained in:
jing's 2024-01-10 23:03:26 +08:00
parent 3b15f04be5
commit 413115a082
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
View File

@ -96,13 +96,14 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
.replace(" ",";") .replace(" ",";")
.replace("，",";") .replace("，",";")
.replace(",",";"); .replace(",",";");
strMaterial=strMaterial.replace("\n","").trim(); strMaterial=strMaterial.replace("\n","");
List<String> listNo = StrUtil.splitTrim(strMaterial,";"); List<String> listNo = StrUtil.splitTrim(strMaterial,";");
listNo = listNo.stream().filter(str -> !str.trim().replace(" ","").isEmpty()).collect(Collectors.toList());
List<BaseMaterialVO> materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForMaterialNo(listNo); List<BaseMaterialVO> materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForMaterialNo(listNo);
if (CollectionUtil.isEmpty(materialListVo)) { if (CollectionUtil.isEmpty(materialListVo)) {
throw new NflgBusinessException(STATE.BusinessError, "未查询到物料相关数据"); throw new NflgBusinessException(STATE.BusinessError, "未查询到物料相关数据");

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
View File

@ -122,6 +122,13 @@ public class AggregOptionConfigService {
} }
OptionalEbomConfigAggregVO optionalEbomConfigAggregVO = new OptionalEbomConfigAggregVO(); OptionalEbomConfigAggregVO optionalEbomConfigAggregVO = new OptionalEbomConfigAggregVO();
try{
Collections.sort(listParent, (option0, option1) -> option0.getOptionDrawingNo().compareTo(option1.getOptionDrawingNo()));
}catch (Exception e){
}
optionalEbomConfigAggregVO.setSingleList(listParent); optionalEbomConfigAggregVO.setSingleList(listParent);
if (CollectionUtil.isEmpty(mulList)) { if (CollectionUtil.isEmpty(mulList)) {