From 8537b3f15dd6470502ad6474d260a5f92e9bf9c9 Mon Sep 17 00:00:00 2001 From: luoliming Date: Fri, 5 Apr 2024 17:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D-=E5=BE=85=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E6=A0=B9=E8=8A=82=E7=82=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/EbomApi.java | 10 ++++++++-- .../product/bomnew/api/user/OriginalBomApi.java | 1 + .../mapper/master/BomNewEbomParentMapper.java | 3 +++ .../pojo/entity/BomNewEbomParentEntity.java | 8 ++++++++ .../bomnew/service/BomNewEbomParentService.java | 4 +++- .../bomnew/service/domain/EBom/EBomEdit.java | 1 - .../mapper/master/BomNewEbomParentMapper.xml | 16 +++++++++++++++- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java index e0ba47b2..d656043f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java @@ -260,6 +260,8 @@ public class EbomApi extends BaseApi { dto.setRevertUserName(SessionUtil.getUserName()); dto.setUserCode(SessionUtil.getUserCode()); bomNewEbomParentService.revertDesign(dto); + //更新-待复核根节点 + bomNewEbomParentService.getBaseMapper().updateRootForWaitReview(); return ResultVO.success(true); @@ -364,7 +366,9 @@ public class EbomApi extends BaseApi { checkDeleteRule(dto); bomNewEbomParentService.deleteBomChild(dto.getDelDatas()); - return ResultVO.success(bomNewEbomParentService.temporary(dto)); + BomNewEbomParentVO temporary = bomNewEbomParentService.temporary(dto); + bomNewEbomParentService.getBaseMapper().updateRootForWaitReview(); + return ResultVO.success(temporary); } @PostMapping("temporaryAdd") @@ -373,7 +377,9 @@ public class EbomApi extends BaseApi { public ResultVO temporaryAdd(@RequestBody BomNewEBomParentEditDTO dto) throws ExecutionException, InterruptedException { checkDeleteRule(dto); bomNewEbomParentService.deleteBomChild(dto.getDelDatas()); - return ResultVO.success(bomNewEbomParentService.temporary(dto)); + BomNewEbomParentVO temporary = bomNewEbomParentService.temporary(dto); + bomNewEbomParentService.getBaseMapper().updateRootForWaitReview(); + return ResultVO.success(temporary); } @PostMapping("submitAdd") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java index 62d26ba9..071dcd8d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OriginalBomApi.java @@ -174,6 +174,7 @@ public class OriginalBomApi extends BaseApi { //跟新EBom 根节点 ebomParentService.getBaseMapper().updateRootState(); + ebomParentService.getBaseMapper().updateRootForWaitReview(); return ResultVO.success(result); } 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 d2182bd8..c73fcf39 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,4 +66,7 @@ public interface BomNewEbomParentMapper extends BaseMapper eBomReverseReport(@Param("bomVersionRowId")Long bomVersionRowId,@Param("startDate") String startDate, @Param("endDate")String endDate, @Param("materialNos")List materialNos); + Integer getCountForWaitReviewByMaterialNo(@Param("materialNo") String materialNo); + + void updateRootForWaitReview(); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java index 6c2fab3e..68c9abf4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java @@ -357,5 +357,13 @@ public class BomNewEbomParentEntity implements Serializable { @ApiModelProperty(value = "修改时间") private LocalDateTime modifyTime; + + /** + * 待复核根节点 + */ + @TableField(value = "root_is_for_wait_review") + @ApiModelProperty(value = "待复核根节点") + private Integer rootIsForWaitReview; + private static final long serialVersionUID = 265246823929418418L; } 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 3686b246..174df938 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 @@ -304,7 +304,9 @@ public class BomNewEbomParentService extends ServiceImpl list = this.lambdaQuery().in(BomNewEbomParentEntity::getMaterialNo, materialNos) .eq(!EBomStatusEnum.PUBLISHED.equalsValue(parent.getStatus()) ,BomNewEbomParentEntity::getLastVersionIs, 1) .eq(EBomStatusEnum.PUBLISHED.equalsValue(parent.getStatus()), BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()).list(); - + if(EBomStatusEnum.CHECKED.equalsValue(parent.getStatus())){ + list=list.stream().filter(u->EBomStatusEnum.CHECKED.equalsValue(u.getStatus())).collect(Collectors.toList()); + } Map bomListMap= list.parallelStream() .collect(Collectors.toMap( BomNewEbomParentEntity::getMaterialNo, // key: DrawingNo 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 09783030..28819596 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 @@ -302,7 +302,6 @@ public class EBomEdit { checkHadBom(dto.getParent().getMaterialNo()); dto.getParent().setBomRowId(dto.getParent().getRowId()); parentEntity = createParentBomInfo(dto.getParent()); - dto.getDatas().forEach(k -> { k.setParentRowId(parentEntity.getRowId()); }); 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 9916bd46..710b7b6c 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 @@ -51,6 +51,8 @@ + + @@ -82,7 +84,7 @@ + +