diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 89cc6023..cd5e81ef 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -535,7 +535,7 @@ public class BomNewEbomParentService extends ServiceImpl bomDetail = this.getBaseMapper().getParentChild(rowId); // EBomDetailTask detailTask = new EBomDetailTask(bomDetail); - EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail,SessionUtil.getUserCode()); + EBomCheckErrorDetailTask detailTask = new EBomCheckErrorDetailTask(bomDetail, SessionUtil.getUserCode(), SpringUtil.getBean(UserRoleService.class).getUserJob()); ForkJoinTask> submit = bomDetailPool.submit(detailTask); List result = submit.join(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java index cf0604af..4edf324b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java @@ -3,11 +3,9 @@ package com.nflg.product.bomnew.service.domain.EBom; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; -import com.nflg.product.bomnew.service.UserRoleService; import com.nflg.product.bomnew.util.ListCommonUtil; import lombok.Getter; import lombok.Setter; @@ -37,13 +35,13 @@ public class EBomCheckErrorDetailTask extends RecursiveTask inBomDetail,String inJobCode) { + public EBomCheckErrorDetailTask(List inBomDetail, String inJobCode, Integer inUserJob) { bomDetail = inBomDetail; jobCode=inJobCode; - + userJob = inUserJob; } /** @@ -55,7 +53,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask childBomlist = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos).eq(BomNewEbomParentEntity::getLastVersionIs, 1).list(); - Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob(); + //Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob(); List childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, jobCode,materialNos); Map stringBomNewOriginalParentEntityMap = ListCommonUtil.listToMap(childBomlist, BomNewEbomParentEntity::getMaterialNo); for (BomNewEbomParentVO detailVO : bomDetail) { @@ -98,7 +96,7 @@ public class EBomCheckErrorDetailTask extends RecursiveTask bom = SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getParentChildBatch(childBowIds); - EBomCheckErrorDetailTask task = new EBomCheckErrorDetailTask(bom); + EBomCheckErrorDetailTask task = new EBomCheckErrorDetailTask(bom, jobCode, userJob); task.fork(); bomDetail.addAll(task.join()); return bomDetail;