From 7357e70ce7a5a1f1e9c2a64ff4e7cad8798424c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 29 Jun 2024 22:55:38 +0800 Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E4=BB=8Eexcel=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=97=B6=EF=BC=8C=E5=B0=86=E6=9C=AC=E4=BA=BA=E4=BB=A5?= =?UTF-8?q?=E5=89=8D=E5=AF=BC=E5=85=A5=E7=9A=84=E8=8D=89=E7=A8=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E7=9A=84=E9=A1=B6=E7=BA=A7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E9=A1=B6=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/EBomImportService.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java index 35e140b8..863512a5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java @@ -118,6 +118,17 @@ public class EBomImportService { }); bomNewEbomParentService.setLastVersionIs0(oldParents.stream().map(BomNewEbomParentEntity::getRowId).collect(Collectors.toList())); } + //取消本人以前导入的，草稿状态的bom的顶级状态 + Set materialNos = children.stream().map(BomNewEbomChildEntity::getMaterialNo).collect(Collectors.toSet()); + bomNewEbomParentService.lambdaUpdate() + .set(BomNewEbomParentEntity::getRootIs, 0) + .set(BomNewEbomParentEntity::getUserRootIs, 0) + .set(BomNewEbomParentEntity::getRootIsForWaitReview, 0) + .in(BomNewEbomParentEntity::getMaterialNo, materialNos) + .lt(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue()) + .eq(BomNewEbomParentEntity::getCreatedBy, SessionUtil.getUserCode()) + .update(); + bomNewEbomParentService.saveBatch(parents); bomNewEbomChildService.saveBatch(children); }