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

Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition

This commit is contained in:
曹鹏飞 2024-05-17 13:38:32 +08:00
parent 314aceba8b 4d07895aff
commit 0e41732dc8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -141,8 +141,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
//子节点
List<BomOriginalListVO> parentChild = bomDetail.stream().filter(u -> Objects.nonNull(u.getParentRowId()) && u.getParentRowId().equals(parentEnt.getBomRowId())).distinct().collect(Collectors.toList());
//合并一般零部件
mergeCommonPartBOM(parentChild);
BomNewEbomParentEntity oldEBom = ebomParentService.lambdaQuery().eq(BomNewEbomParentEntity::getMaterialNo, parentEnt.getMaterialNo()).last(" order by current_version desc limit 1").one();
List<BomNewEbomChildEntity> oldParenChild = ebomChildService.getBaseMapper().getChildByMaterialNo(parentEnt.getMaterialNo());
@ -228,11 +227,17 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
* @param
*/
private void handlerChild(BomOriginalListVO parentEntity, List<BomOriginalListVO> parentChild) {
for (BomOriginalListVO childVo : parentChild) {
if (StrUtil.isBlank(childVo.getMaterialNo())) {
handlerCommonMaterialForReplace(childVo);
} else if (StrUtil.isNotBlank(childVo.getMaterialNo()) && StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) {
}
}
//合并一般零部件
parentChild= mergeCommonPartBOM(parentChild);
for (BomOriginalListVO childVo : parentChild) {
if (StrUtil.isNotBlank(childVo.getMaterialNo()) && StrUtil.isNotBlank(childVo.getMaterialCategoryCode()) && childVo.getMaterialCategoryCode().equals(OriginalConstant.COMMON_MATERIAL_CATEGORY_CODE)) {
//找到对应物料
BaseMaterialVO materialBaseInfo = getCommonMaterialByRel(childVo);
@ -298,6 +303,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
parentEntity.setMaterialUnit("KG");
parentEntity.setNum(parentEntity.getTotalWeight());
parentEntity.setProjectType("L");
parentEntity.setRegReplaceIs(1);
} else {
parentEntity.setMaterialDesc(parentEntity.getMaterialName());
}