From 5a78ef449a9281b48b6ef44ad92a0fb9caccabb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 20 Jun 2024 15:31:37 +0800 Subject: [PATCH] =?UTF-8?q?optimize(ebom):=20=E4=BC=98=E5=8C=96=E4=BB=8Eex?= =?UTF-8?q?cel=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/bomnew/api/user/EbomV2Api.java | 2 +- .../com/nflg/product/bomnew/service/EBomImportService.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java index b997b5bb..45a87768 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomV2Api.java @@ -72,7 +72,7 @@ public class EbomV2Api extends BaseApi { ebomParentService.getBaseMapper().updateRootState(); ebomParentService.getBaseMapper().updateRootForWaitReview(); - ebomParentService.resetAllBomExist(); + ebomParentService.resetAllBomExist(parents.stream().map(BomOriginalCadParentEntity::getMaterialNo).collect(Collectors.toSet())); } catch (Exception e) { VUtils.isTure(true).throwMessage("转换失败：" + e.getMessage()); } finally { 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 c9abccf4..db42d602 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 @@ -81,7 +81,7 @@ public class EBomImportService { save(pcs.getLeft(), pcs.getRight()); - bomNewEbomParentService.resetAllBomExist(); + // bomNewEbomParentService.resetAllBomExist(pcs.getLeft().stream().map(BomNewEbomParentEntity::getMaterialNo).collect(Collectors.toSet())); bomNewEbomParentService.batchCheckAndSaveEBomException(importRoots.stream() .map(BomNewEbomParentEntity::getRowId) @@ -109,13 +109,15 @@ public class EBomImportService { parents.stream().filter(it -> StrUtil.equals(it.getMaterialNo(), p.getMaterialNo())).forEach(it -> { it.setCurrentVersion(p.getCurrentVersion()); }); + p.setLastVersionIs(0); } else { parents.stream().filter(it -> StrUtil.equals(it.getMaterialNo(), p.getMaterialNo())).forEach(it -> { it.setCurrentVersion(VersionUtil.getNextVersionForSmallVersion(p.getCurrentVersion())); }); } }); - bomNewEbomParentService.setLastVersionIs0(pMaterialNos); + //bomNewEbomParentService.setLastVersionIs0(oldParents.stream().map(BomNewEbomParentEntity::getMaterialNo).collect(Collectors.toSet())); + bomNewEbomParentService.updateBatchById(oldParents.stream().filter(f -> f.getLastVersionIs() == 0).collect(Collectors.toList())); bomNewEbomParentService.saveBatch(parents); bomNewEbomChildService.saveBatch(children); } @@ -359,6 +361,7 @@ public class EBomImportService { private void buildChild(List children, List materialBaseInfos , EbomExcelDTO data, BomNewEbomParentEntity p, List parents) { + p.setBomExist(1); BomNewEbomChildEntity child = new BomNewEbomChildEntity(); child.setRowId(IdWorker.getId()); child.setParentRowId(p.getRowId());