From d0050dd1adf29c72955ee593f7b60fe3924cebb4 Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 28 Mar 2024 16:47:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 33 +++++++++++-------- .../bomnew/service/domain/EBom/EBomEdit.java | 7 ++-- 2 files changed, 25 insertions(+), 15 deletions(-) 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 890d5018..3d7455dd 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 @@ -1106,7 +1106,7 @@ public class BomNewEbomParentService extends ServiceImpl rowIds = dto.getRowIdList(); - List bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, rowIds).eq(BomNewEbomParentEntity::getRootIs, 1).list(); + List bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, rowIds).eq(BomNewEbomParentEntity::getUserRootIs, 1).list(); if (CollUtil.isEmpty(bomNewEbomParentEntityList)) { VUtils.isTure(true).throwMessage("下级BOM无法进行退回，请选择顶层"); } @@ -1471,7 +1471,7 @@ public class BomNewEbomParentService extends ServiceImpl queryWrapper=new QueryWrapper<>(); queryWrapper.lambda() .eq(BomNewEbomParentEntity::getRowId, bomRowId) - .eq(BomNewEbomParentEntity::getRootIs, 1); + .eq(BomNewEbomParentEntity::getUserRootIs, 1); BomNewEbomParentEntity parentEntity = this.getBaseMapper().selectOne(queryWrapper); @@ -1486,18 +1486,27 @@ public class BomNewEbomParentService extends ServiceImpl bomRowIdList= eBomDel.getDelEBom().stream() + .map(BomNewEbomParentVO::getBomRowId) .collect(Collectors.toList()); + + //取bom信息删除 - this.getBaseMapper().delBatch(eBomDel.getDelEBom().stream() - .map(BomNewEbomParentVO::getBomRowId) - .collect(Collectors.toList())); + this.getBaseMapper().delBatch(bomRowIdList); + QueryWrapper delChildQuery=new QueryWrapper<>(); + delChildQuery.lambda().in(BomNewEbomChildEntity::getParentRowId,bomRowIdList); + SpringUtil.getBean(BomNewEbomChildService.class).getBaseMapper().delete(delChildQuery); + } @@ -1506,6 +1515,10 @@ public class BomNewEbomParentService extends ServiceImpl rowIds = eBomDel.getRevertOBom().stream().map(BomNewEbomParentVO::getSourceRowId).collect(Collectors.toList()); SpringUtil.getBean(BomNewOriginalParentService.class).revertBom(rowIds); } + + + + if (CollectionUtil.isNotEmpty(eBomDel.getDelEBom())) { ThreadUtil.execAsync(() -> computeLevelNumAndRootState()); @@ -1672,12 +1685,6 @@ public class BomNewEbomParentService extends ServiceImpl childList = dto.getDatas(); - - if (dto.getParent().getRootIs() == null || dto.getParent().getRootIs() == 0) { - childList.add(dto.getParent()); - - } return true; 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 81365e9b..d98822b6 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 @@ -244,7 +244,10 @@ public class EBomEdit { QueryWrapper queryChildWrapper=new QueryWrapper<>(); - List rowIds=notNullRowIdList.stream().map(BomNewEbomParentVO::getRowId).collect(Collectors.toList()); + List rowIds=notNullRowIdList.stream().filter(u->ObjectUtil.isNotNull(u.getRowId()) && u.getRowId()>0 ).map(BomNewEbomParentVO::getRowId).collect(Collectors.toList()); + if(CollUtil.isEmpty(rowIds)){ + return; + } queryChildWrapper.lambda().in(BomNewEbomChildEntity::getRowId,rowIds); List childList=SpringUtil.getBean(BomNewEbomChildService.class).list(queryChildWrapper); @@ -285,7 +288,7 @@ public class EBomEdit { //缺bom if (dto.getParent().getBomRowId() == null || dto.getParent().getBomRowId().longValue() == 0) { - checkHadBom(dto.getParent().getMaterialNo()); + checkHadBom(dto.getParent().getMaterialNo()); dto.getParent().setBomRowId(dto.getParent().getRowId()); parentEntity = createParentBomInfo(dto.getParent()); From 17293e495de189cb52f2d707b93bffbe9796074d Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 28 Mar 2024 17:03:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=8A=A0bom=20?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/BomNewEbomParentService.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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 3d7455dd..19523798 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 @@ -1605,8 +1605,15 @@ public class BomNewEbomParentService extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(BomNewEbomParentEntity::getMaterialNo, eBomEdit.getParentEntity().getMaterialNo()); + queryWrapper.lambda().eq(BomNewEbomParentEntity::getLastVersionIs, 1); + queryWrapper.lambda().notIn(BomNewEbomParentEntity::getRowId, eBomEdit.getParentEntity().getRowId()); + BomNewEbomParentEntity oldParent= this.getOne(queryWrapper); + if(oldParent!=null){ + eBomEdit.getParentEntity().setCurrentVersion(oldParent.getCurrentVersion()); + BomNewEbomParentEntity updateOld=new BomNewEbomParentEntity(); + updateOld.setLastVersionIs(0); + updateOld.setModifyTime(LocalDateTime.now()); + updateOld.setRowId(oldParent.getRowId()); + this.updateById(updateOld); + } + + } + + this.saveOrUpdate(eBomEdit.getParentEntity()); }