From 6588752cdedbf446bd96374f6c8b9f2e3d0bb37c Mon Sep 17 00:00:00 2001 From: luoliming Date: Sun, 21 Jul 2024 22:21:25 +0800 Subject: [PATCH] =?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} + + + + + + + + +