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-06-24 13:32:51 +08:00
parent a22d26e739 fb104e9d53
commit bfc126fe80
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,6 +348,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
childEntity.setCreatedBy(SessionUtil.getUserCode()); childEntity.setCreatedBy(SessionUtil.getUserCode());
childEntity.setMaterialUnit("KG"); childEntity.setMaterialUnit("KG");
childEntity.setProjectType("L"); childEntity.setProjectType("L");
parent.setBomExist(1);
// this.eBomChildResult.add(childEntity); // this.eBomChildResult.add(childEntity);
return childEntity; return childEntity;

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

@ -179,6 +179,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert {
List<BaseMaterialVO> materialBaseInfo = SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(ImmutableList.of(materialMate.getMaterialNo())); List<BaseMaterialVO> materialBaseInfo = SpringUtil.getBean(MaterialMainMapper.class).getMaterialBaseInfo(ImmutableList.of(materialMate.getMaterialNo()));
if (CollUtil.isNotEmpty(materialBaseInfo)) { if (CollUtil.isNotEmpty(materialBaseInfo)) {
//根据物料编码- //根据物料编码-
parentEntity.setBomExist(1);
buildCommonChildEntity(materialBaseInfo.get(0), parentEntity); buildCommonChildEntity(materialBaseInfo.get(0), parentEntity);
} }