From fe7507e819374bba0ede7433bccde6d7a41c3ab3 Mon Sep 17 00:00:00 2001 From: jing's Date: Wed, 17 Apr 2024 16:03:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?EBOM=E5=9C=A8=E8=8D=89=E7=A8=BF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E5=A4=9A=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=8C=E8=BF=99?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/service/domain/EBom/EBomEdit.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java index 4d475faa..4c8bea6d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java @@ -42,6 +42,8 @@ public class EBomEdit { private BomNewEbomParentEntity parentEntity; @Getter private boolean isRootForWaitReview=false; + @Getter + private boolean isNewBom=false; public List childEntities; @@ -91,6 +93,7 @@ public class EBomEdit { isRootForWaitReview=true; } + isNewBom=true; parent.setCreatedTime(LocalDateTime.now()); parent.setModifyTime(LocalDateTime.now()); @@ -335,6 +338,11 @@ public class EBomEdit { public void nextVersion(){ + + if(!isNewBom){ + return; + } + //缺bom，新建的bom 版本增加 //同一物料且存在一个 lastVersionIs=1 if(ObjectUtil.isNotNull(getParentEntity().getLastVersionIs()) && ObjectUtil.equal(getParentEntity().getLastVersionIs(),1)) { From 92c7d63a04b56aa14ff6b0fa702aca9f024682f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Wed, 17 Apr 2024 18:21:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1=E3=80=81=E5=BC=82=E5=B8=B8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/BomNewEbomParentMapper.java | 3 + .../service/BomNewEbomParentService.java | 4 +- .../domain/EBom/CheckEBomException.java | 2 +- .../domain/EBom/EBomCheckErrorDetailTask.java | 114 ++++++++++++++++++ .../mapper/master/BomNewEbomParentMapper.xml | 16 +++ 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index c2c67469..74262530 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -78,4 +78,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getMaterialParent(@Param("materialNos") Collection materialNos ,@Param("createdBy") String createdBy); void resetAllBomExist(); + + + List getEBomParentByMaterialNos(@Param("job") Integer job, @Param("createdBy")String createdBy, @Param("materialNos") List materialNos); } 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 70f9e8c1..e1a6cf58 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 @@ -533,7 +533,9 @@ public class BomNewEbomParentService extends ServiceImpl getBomTree(Long rowId, Boolean generateLevelNumberFlag) throws ExecutionException, InterruptedException { List bomDetail = this.getBaseMapper().getParentChild(rowId); - EBomDetailTask detailTask = new EBomDetailTask(bomDetail); +// EBomDetailTask detailTask = new EBomDetailTask(bomDetail); + + EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail); 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/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index a51ac5a8..188aca1b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -61,7 +61,7 @@ public class CheckEBomException { allBomDetail = SpringUtil.getBean(BomNewEbomParentService.class).getBomTree(bomRowId, true); //只检查待复核和自己的 - allBomDetail=allBomDetail.stream().filter(u-> SessionUtil.getUserCode().equals(u.getCreatedBy()) && u.getStatus().equals(1) ).collect(Collectors.toList()); + //allBomDetail=allBomDetail.stream().filter(u-> SessionUtil.getUserCode().equals(u.getCreatedBy()) && u.getStatus().equals(1) ).collect(Collectors.toList()); BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).getById(bomRowId); if (Objects.isNull(parent)){ return; 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 new file mode 100644 index 00000000..4614f40a --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomCheckErrorDetailTask.java @@ -0,0 +1,114 @@ +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; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.RecursiveTask; +import java.util.stream.Collectors; + +/** + * @author 大米(异常检查专用) + * @descreption + * @date 2023/7/8 9:18 + */ +public class EBomCheckErrorDetailTask extends RecursiveTask> { + + private List bomDetail; + + + + @Getter + @Setter + public static int levelNum=1; + + List result = new ArrayList<>(); + + + + + public EBomCheckErrorDetailTask(List inBomDetail) { + bomDetail = inBomDetail; + + + } + + /** + * 处理BOM明细中未选择Bom版本的明细；使用最新版 + */ + public void handlerChildBomVersionDetail() { + List materialNos = bomDetail.stream().filter(u -> StrUtil.isNotBlank(u.getMaterialNo()) ).map(BomNewEbomParentVO::getMaterialNo).collect(Collectors.toList()); + + if (CollUtil.isNotEmpty(materialNos)) { + + // List childBomlist = SpringUtil.getBean(BomNewEbomParentService.class).lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos).eq(BomNewEbomParentEntity::getLastVersionIs, 1).list(); + Integer userJob = SpringUtil.getBean(UserRoleService.class).getUserJob(); + List childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, SessionUtil.getUserCode(),materialNos); + Map stringBomNewOriginalParentEntityMap = ListCommonUtil.listToMap(childBomlist, BomNewEbomParentEntity::getMaterialNo); + for (BomNewEbomParentVO detailVO : bomDetail) { + if (stringBomNewOriginalParentEntityMap.containsKey(detailVO.getMaterialNo())) { + BomNewEbomParentEntity ebomParentEntity = stringBomNewOriginalParentEntityMap.get(detailVO.getMaterialNo()); + detailVO.setChildBomRowId(ebomParentEntity.getRowId()); + detailVO.setBomRowId(ebomParentEntity.getRowId()); + detailVO.setSourceRowId(ebomParentEntity.getSourceRowId()); + detailVO.setCurrentVersion(ebomParentEntity.getCurrentVersion()); + detailVO.setDeviseUserCode(ebomParentEntity.getDeviseUserCode()); + detailVO.setDeptName(ebomParentEntity.getDeptName()); + detailVO.setDeviseName(ebomParentEntity.getDeviseName()); + detailVO.setBomExist(ebomParentEntity.getBomExist()); + detailVO.setStatus(ebomParentEntity.getStatus()); + } + } + + + } + + + } + + /** + * 递归调用零部件BOM + * + * @return + */ + @Override + protected List compute() { + + handlerChildBomVersionDetail(); + // 最新 BOM 版本 + + result.addAll(bomDetail); + + if (CollUtil.isNotEmpty(bomDetail)) { + levelNumAdd(); + List childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(childBowIds)) { + List bom = SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getParentChildBatch(childBowIds); + + EBomCheckErrorDetailTask task = new EBomCheckErrorDetailTask(bom); + task.fork(); + bomDetail.addAll(task.join()); + return bomDetail; + } + + } + return result; + + + } + + public synchronized void levelNumAdd(){ + levelNum++; + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 54b3606d..9348a08c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -361,4 +361,20 @@ SET p.bom_exist = (IF(EXISTS (SELECT 1 FROM t_bom_new_ebom_child WHERE parent_row_id = p.row_id), 1, 0)) WHERE p.status < 4; + + From 9f3fa8f4e9f4c206d7a339f56fe3dc3208e36084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 17 Apr 2024 20:21:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/EBom/CheckEBomException.java | 2 +- .../nflg/product/base/core/api/BaseApi.java | 26 ++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java index 04989244..bb50a311 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; @@ -16,6 +15,7 @@ import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.MaterialMainService; import com.nflg.product.bomnew.util.BomLevelUtil; +import com.nflg.product.bomnew.util.ListCommonUtil; import com.nflg.product.bomnew.util.TreeUtils; import com.nflg.product.bomnew.util.VUtils; import lombok.Getter; diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java index 0df6bb54..044ddca2 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/api/BaseApi.java @@ -1,19 +1,15 @@ package com.nflg.product.base.core.api; -import com.nflg.product.base.core.exception.NflgBusinessException; import nflg.product.common.constant.STATE; import nflg.product.common.dto.LoginUserInfoDTO; import nflg.product.common.util.JwtUtil; import nflg.product.common.vo.ResultVO; -import org.springframework.http.server.reactive.ServerHttpRequest; -import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ModelAttribute; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Objects; -import java.util.Optional; public class BaseApi { protected HttpServletRequest request; @@ -24,21 +20,15 @@ public class BaseApi { @ModelAttribute private void initLoginInfo(HttpServletRequest request) { - try { - String token = request.getHeader("authorization"); - String language=Objects.nonNull(request.getHeader("language"))? request.getHeader("language") :"zh_cn"; - ResultVO result = JwtUtil.parse(token); - if (result.getState().equals(STATE.Success.getState())) { - LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); - userInfo.setSessionKey(token); - userInfo.setLanguage(language); - loginUser.set(userInfo); - } - } catch (Exception ex) { - // throw new NflgBusinessException(STATE.SystemErr,"token 解析出错"); + String token = request.getHeader("authorization"); + String language = Objects.nonNull(request.getHeader("language")) ? request.getHeader("language") : "zh_cn"; + ResultVO result = JwtUtil.parse(token); + if (result.getState().equals(STATE.Success.getState())) { + LoginUserInfoDTO userInfo = (LoginUserInfoDTO) result.getData(); + userInfo.setSessionKey(token); + userInfo.setLanguage(language); + loginUser.set(userInfo); } - - } From f796e098e5d45d2976fc925543a449606f982694 Mon Sep 17 00:00:00 2001 From: luoliming Date: Wed, 17 Apr 2024 20:57:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 2 +- .../service/domain/EBom/EBomCheckErrorDetailTask.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 e1a6cf58..066a0fdf 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); + EBomCheckErrorDetailTask detailTask=new EBomCheckErrorDetailTask(bomDetail,SessionUtil.getUserCode()); 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 4614f40a..cf0604af 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 @@ -35,12 +35,14 @@ public class EBomCheckErrorDetailTask extends RecursiveTask result = new ArrayList<>(); + private String jobCode; - public EBomCheckErrorDetailTask(List inBomDetail) { + + public EBomCheckErrorDetailTask(List inBomDetail,String inJobCode) { bomDetail = inBomDetail; - + jobCode=inJobCode; } @@ -54,7 +56,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(); - List childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, SessionUtil.getUserCode(),materialNos); + List childBomlist=SpringUtil.getBean(BomNewEbomParentService.class).getBaseMapper().getEBomParentByMaterialNos(userJob, jobCode,materialNos); Map stringBomNewOriginalParentEntityMap = ListCommonUtil.listToMap(childBomlist, BomNewEbomParentEntity::getMaterialNo); for (BomNewEbomParentVO detailVO : bomDetail) { if (stringBomNewOriginalParentEntityMap.containsKey(detailVO.getMaterialNo())) { From a762b57fe28c07ec7b62cc452fffb254a8352050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 17 Apr 2024 21:47:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/BomNewEbomParentService.java | 2 +- .../domain/EBom/EBomCheckErrorDetailTask.java | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) 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;