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

feat(ebom): sap排序字符串优化

This commit is contained in:
曹鹏飞 2024-05-27 15:32:39 +08:00
parent b5bd4c40db
commit 043143306f
3 changed files with 12 additions and 5 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/BomNewEbomParentService.java
View File

@ -339,7 +339,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
List<BomNewEbomParentVO> parentChild = this.getBaseMapper().getParentChild(rowId);
//排除项目类别的赋值
materialMainService.intiMaterialInfoInPattern(parentChild, "^21 | ^31", EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
List<BaseMaterialVO> materialVOS = materialMainService.intiMaterialInfoInPattern(parentChild, "^21 | ^31", EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
if (CollUtil.isNotEmpty(parentChild)) {
List<String> materialNos = parentChild.stream().map(BaseMaterialVO::getMaterialNo).filter(StrUtil::isNotBlank).collect(Collectors.toList());
if (CollUtil.isNotEmpty(materialNos)) {
@ -411,7 +411,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
}
}
child.setChildBomRowId(child.getRowId());
child.setSapOrderNum(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode()
BaseMaterialVO mvo = materialVOS.stream().filter(m -> StrUtil.equals(m.getMaterialNo(), child.getMaterialNo())).findFirst().orElse(null);
child.setSapOrderNum(BomUtil.generateSapOrderNum(child.getProjectType(), Objects.isNull(mvo) ? "" : mvo.getMaterialCategoryCode()
, "1010", child.getMaterialNo(), child.getBomExist()));
}
}

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

@ -132,7 +132,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
}
//
public <T extends BaseMaterialVO> void intiMaterialInfoInPattern(List<T> data , String ignoreMaterialRemarkToNnamePattern , String ... ignorePropertyList) {
public <T extends BaseMaterialVO> List<BaseMaterialVO> intiMaterialInfoInPattern(List<T> data, String ignoreMaterialRemarkToNnamePattern, String... ignorePropertyList) {
List<String> materialNos = data.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo())).map(u -> u.getMaterialNo()).collect(Collectors.toList());
if (CollUtil.isNotEmpty(materialNos)) {
List<BaseMaterialVO> materialBaseInfos = SpringUtil.getBean(MaterialMainService.class).getMaterialBaseInfo(materialNos);
@ -146,7 +146,9 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
}
}
}
return materialBaseInfos;
}
return null;
}

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/util/BomUtil.java
View File

@ -61,10 +61,14 @@ public class BomUtil {
if (StrUtil.equals(categoryCode, "100101")) {
orderNum = "0010";
}
if (StrUtil.equals(categoryCode, "102101")
|| (Integer.parseInt(categoryCode) >= 100102 && Integer.parseInt(categoryCode) <= 100104)) {
if (StrUtil.equals(categoryCode, "102101")) {
orderNum = "0020";
}
if (StrUtil.isNotBlank(categoryCode)) {
if (Integer.parseInt(categoryCode) >= 100102 && Integer.parseInt(categoryCode) <= 100104) {
orderNum = "0020";
}
}
if (StrUtil.equals(categoryCode, "100301") && StrUtil.equals(factoryCode, "1010")) {
orderNum = "0050";
}