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

1.异常判断7,9

This commit is contained in:
大米 2023-12-26 19:12:12 +08:00
parent dfe9dd80ed
commit e087fdb4fc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EbomInitProjectType.java
View File

@ -134,7 +134,7 @@ public class EbomInitProjectType {
sResult = sameLevelChild.stream().filter(u -> u.getMaterialCategoryCode().startsWith("2005") || u.getMaterialCategoryCode().startsWith("2006")).collect(Collectors.toList()); sResult = sameLevelChild.stream().filter(u -> u.getMaterialCategoryCode().startsWith("2005") || u.getMaterialCategoryCode().startsWith("2006")).collect(Collectors.toList());
if (CollUtil.isNotEmpty(sResult)) { if (CollUtil.isNotEmpty(sResult)) {
List<String> projectType = sResult.stream().filter(u->StrUtil.isNotBlank(u.getProjectType())).map(u -> u.getProjectType()).distinct().collect(Collectors.toList()); List<String> projectType = sResult.stream().filter(u->StrUtil.isNotBlank(u.getProjectType())).map(u -> u.getProjectType()).distinct().collect(Collectors.toList());
if (projectType.size() == 1 && projectType.get(0).equals("Q")) { if (projectType.size() == 1 && projectType.get(0).equals("Q") && !ProjectTypeInputTypeEnum.MANUAL_INPUT.equalsValue(child.getProjectTypeInputType())) {
child.setProjectType("Q"); child.setProjectType("Q");
} }
} }
@ -161,7 +161,7 @@ public class EbomInitProjectType {
for (BomNewEbomParentVO v : sResultProjectL) { for (BomNewEbomParentVO v : sResultProjectL) {
lResult = lResult & projectTypeEquals(getChilds(v.getBomRowId()), Sets.newHashSet("F", "Q")); lResult = lResult & projectTypeEquals(getChilds(v.getBomRowId()), Sets.newHashSet("F", "Q"));
} }
if ((resultNo1004 & lResult) == 1) { if ((resultNo1004 & lResult) == 1 && !ProjectTypeInputTypeEnum.MANUAL_INPUT.equalsValue(child.getProjectTypeInputType())) {
child.setProjectType("F"); child.setProjectType("F");
} }