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 dev

This commit is contained in:
曹鹏飞 2024-04-17 21:08:47 +08:00
parent 9f3fa8f4e9 f796e098e5
commit 4468d8b9ea
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,7 +535,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
List<BomNewEbomParentVO> bomDetail = this.getBaseMapper().getParentChild(rowId);
// EBomDetailTask detailTask = new EBomDetailTask(bomDetail);
EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail);
EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail,SessionUtil.getUserCode());
ForkJoinTask<List<BomNewEbomParentVO>> submit = bomDetailPool.submit(detailTask);
List<BomNewEbomParentVO> result = submit.join();

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

@ -35,12 +35,14 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
List<BomNewEbomParentVO> result = new ArrayList<>();
private String jobCode;
public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail) {
public EBomCheckErrorDetailTask(List<BomNewEbomParentVO> inBomDetail,String inJobCode) {
bomDetail = inBomDetail;
jobCode=inJobCode;
}
@ -54,7 +56,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask<List<BomNewEbomParen
// List<BomNewEbomParentEntity> childBomlist = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos).eq(BomNewEbomParentEntity::getLastVersionIs, 1).list();
Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob();
List<BomNewEbomParentEntity> childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, SessionUtil.getUserCode(),materialNos);
List<BomNewEbomParentEntity> childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, jobCode,materialNos);
Map<String, BomNewEbomParentEntity> stringBomNewOriginalParentEntityMap = ListCommonUtil.listToMap(childBomlist, BomNewEbomParentEntity::getMaterialNo);
for (BomNewEbomParentVO detailVO : bomDetail) {
if (stringBomNewOriginalParentEntityMap.containsKey(detailVO.getMaterialNo())) {