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-29 15:48:16 +08:00
parent 5643eab9ec 207b1a6d44
commit 23f3147edc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1118,7 +1118,11 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
ImportSapParamDTO sapDto = new ImportSapParamDTO(); ImportSapParamDTO sapDto = new ImportSapParamDTO();
sapDto.setZID(RandomUtil.randomNumbers(5)); sapDto.setZID(RandomUtil.randomNumbers(5));
sapDto.setI_WERKS("1"); if (StrUtil.equals(root.getFacCode(), EBomConstant.MAIN_FACTORY_CODE_1010)) {
sapDto.setI_WERKS("1");
} else if (StrUtil.equals(root.getFacCode(), EBomConstant.XIAN_TAO_FACTORY_CODE_1020)) {
sapDto.setI_WERKS("2");
}
sapDto.setI_STLAN("1"); sapDto.setI_STLAN("1");
sapDto.setI_EMPNO(root.getCreatedBy()); sapDto.setI_EMPNO(root.getCreatedBy());
List<T1DTO> t1s = new ArrayList<>(); List<T1DTO> t1s = new ArrayList<>();
@ -1156,7 +1160,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
for (BomNewPbomChildEntity c : children) { for (BomNewPbomChildEntity c : children) {
BomNewPbomParentEntity cp = lambdaQuery() BomNewPbomParentEntity cp = lambdaQuery()
.eq(BomNewPbomParentEntity::getMaterialNo, c.getMaterialNo()) .eq(BomNewPbomParentEntity::getMaterialNo, c.getMaterialNo())
.eq(BomNewPbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) .eq(BomNewPbomParentEntity::getFacCode, parent.getFacCode())
.eq(BomNewPbomParentEntity::getStatus, PBomStatusEnum.FACTORY_CONFIRM.getValue())
.orderByDesc(BomNewPbomParentEntity::getRowId) .orderByDesc(BomNewPbomParentEntity::getRowId)
.last(" limit 1") .last(" limit 1")
.one(); .one();