From 6588752cdedbf446bd96374f6c8b9f2e3d0bb37c Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 21 Jul 2024 22:21:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ebom-=E6=9D=A5=E6=BA=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/BomNewEbomParentMapper.java | 9 +++++++++ .../bomnew/service/BomNewEbomParentService.java | 5 +++-- .../mapper/master/BomNewEbomParentMapper.xml | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) 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 90f8ab7f..55b14ea6 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 @@ -109,4 +109,13 @@ public interface BomNewEbomParentMapper extends BaseMapper getReverseBoms(Long parentRowId); + + //判断是否跟节点 + Integer isRoot(@Param("materialNo") String materialNo); + + //判断是否用户跟节点 + Integer isUserRoot(@Param("materialNo")String materialNo, @Param("createdBy") String createdBy); + + //判断是否跟节点 + Integer isRootIsForWaitReview(@Param("materialNo") String materialNo); } 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 7fad3971..dc487b2b 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 @@ -1249,8 +1249,9 @@ public class BomNewEbomParentService extends ServiceImpl0?0:1); + newParent.setUserRootIs(this.getBaseMapper().isUserRoot(parent.getMaterialNo(),SessionUtil.getUserCode())>0?0:1); + newParent.setRootIsForWaitReview(this.getBaseMapper().isRootIsForWaitReview(parent.getMaterialNo())>0?0:1); newParent.setSapState(1); newParent.setSapTime(null); newParent.setModifyTime(null); 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 19756e84..e5171c7a 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 @@ -616,4 +616,20 @@ #{parentRowId} + + + + + + + + + From 55ee9fc8a7f7cb994fd2c62309406a0445544d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 22 Jul 2024 10:57:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8Debom?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=A1=A8=E6=A0=B9=E6=8D=AE=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/master/BomNewEbomParentMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e5171c7a..dadbad5c 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 @@ -432,9 +432,9 @@ created_by=#{userCode} - AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR + AND (((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR - root_is_for_wait_review=1) AND created_by=#{userCode}) + root_is_for_wait_review=1) AND created_by=#{userCode})) AND devise_name LIKE concat('%', #{query.deviseName}, '%') From a9cf538ba96b3f5a4056cec134904586605157cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 22 Jul 2024 12:32:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?EBOM-=E6=9C=80=E6=96=B0=E7=89=88=E5=8F=8D?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewEbomParentMapper.java | 2 ++ .../service/domain/ReverseReport/EBomQueryService.java | 5 ++++- .../resources/mapper/master/BomNewEbomParentMapper.xml | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) 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 3f6dc5d9..f362c2b4 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 @@ -66,6 +66,8 @@ public interface BomNewEbomParentMapper extends BaseMapper eBomReverseReport(@Param("bomVersionRowId")Long bomVersionRowId,@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("materialNo")String materialNo); + + List eBomReverseReportNewst(@Param("materialNo")String materialNo); Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo); void updateRootForWaitReview(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java index 105fad22..30213380 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQueryService.java @@ -57,6 +57,7 @@ public class EBomQueryService { public List singleLevelReport(ReverseReportQuery queryParam) { Long bomVersionRowId=0L; //指定版本 + List vos=new ArrayList<>(); if (queryParam.getVersionStrategy().equals(2) || (queryParam.getVersionStrategy().equals(1) && StrUtil.isNotBlank(queryParam.getBomVersion()))) { BomNewEbomParentFormalEntity one = ebomParentFormalService.lambdaQuery() @@ -64,6 +65,8 @@ public class EBomQueryService { .eq(BomNewEbomParentFormalEntity::getCurrentVersion, queryParam.getBomVersion()) .one(); bomVersionRowId = Objects.nonNull(one) ? one.getRowId() : 0L; + + vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo()); }//最新版本 else if (queryParam.getVersionStrategy().equals(0)) { BomNewEbomParentEntity one = ebomParentService.lambdaQuery() @@ -73,8 +76,8 @@ public class EBomQueryService { if (Objects.nonNull(one)) { bomVersionRowId = one.getRowId(); } + vos = ebomParentService.getBaseMapper().eBomReverseReportNewst(queryParam.getMaterialNo()); } - List vos = ebomParentService.getBaseMapper().eBomReverseReport(bomVersionRowId, queryParam.getStartDate(), queryParam.getEndDate(), queryParam.getMaterialNo()); if (CollUtil.isNotEmpty(vos)) { List materialVOS = materialMainService.getMaterialBaseInfo(vos.stream().map(ReverseReportVO::getMaterialNo).collect(Collectors.toList())); vos.forEach(it -> { 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 19756e84..89822826 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 @@ -365,6 +365,13 @@ and a.material_no =#{materialNo} + + +