From 6176f3b903d36a9173d00c84d0e48c65fc7d7b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Fri, 28 Jun 2024 09:30:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=98=E6=9B=B4=E5=BD=B1=E5=93=8D-?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BomNewEbomUpgradeChangeEntity.java | 2 +- .../BomNewEbomUpgradeChangeService.java | 18 +++++++++++------- .../domain/EBom/ChangeImpactUpgrade.java | 11 +++++++++-- .../service/domain/EBom/EBomToPbomBase.java | 7 ++++++- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomUpgradeChangeEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomUpgradeChangeEntity.java index 930ca5ed..fad9aa13 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomUpgradeChangeEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomUpgradeChangeEntity.java @@ -116,7 +116,7 @@ public class BomNewEbomUpgradeChangeEntity implements Serializable { @ApiModelProperty(value = "虚拟包父级物料编码") private String virtualMaterialParentMaterialNo; - @TableField(value = "virtual_material_parent_material_no") + @TableField(value = "fac_code") @ApiModelProperty("工厂编码") private String facCode; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java index eec5711a..e7145bc4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomUpgradeChangeService.java @@ -61,6 +61,8 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl bomTree =ebomParentService.getFormalBomTree(ebom.getRowId()); BomNewEbomParentVO parentBom = Convert.convert(BomNewEbomParentVO.class, ebom); @@ -96,16 +98,18 @@ public class BomNewEbomUpgradeChangeService extends ServiceImpl oldPBomRowIds = updateImpact.getOldPBomList().stream().map(u -> u.getRowId()).collect(Collectors.toList()); + pbomParentService.getBaseMapper().insertPBomParentToFormal(oldPBomRowIds); + pbomParentService.getBaseMapper().insertPBomChildToFormal(oldPBomRowIds); + pbomParentService.getBaseMapper().delPBom(oldPBomRowIds); + } ent.setStatus(1); ent.setUpdatedTime(LocalDateTime.now()); - this.save(ent); + this.updateById(ent); } - - - - - }; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java index b265b2ec..41e04fb6 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/ChangeImpactUpgrade.java @@ -31,6 +31,11 @@ public class ChangeImpactUpgrade extends EBomToPbomBase { //需升级虚拟包编码 private String vMaterialNo; + //旧版Pbom-需移到历史表中 + + @Getter + private List oldPBomList=new ArrayList<>(); + public ChangeImpactUpgrade(BomNewEbomParentVO inParent, List inAllBomDetail, List inFacCodes, String vMaterialNo) { this.parent = inParent; @@ -116,7 +121,7 @@ public class ChangeImpactUpgrade extends EBomToPbomBase { .eq(BomNewPbomParentEntity::getMaterialNo, parentVo.getMaterialNo()) .eq(BomNewPbomParentEntity::getFacCode, facCode).last(" order by current_version desc limit 1").one(); - if (Objects.isNull(oldParent) || !samePBomIs(oldParent.getRowId(), newChild)) { + if (Objects.isNull(oldParent) || samePBomIs(oldParent.getRowId(), newChild)) { return null; } //pbom 处于工作表 @@ -149,7 +154,7 @@ public class ChangeImpactUpgrade extends EBomToPbomBase { BeanUtil.copyProperties(parentVo, pBomParent, "sourceRowId"); pBomParent.setSourceRowId(parentVo.getBomRowId()); pBomParent.setRowId(IdWorker.getId()); - pBomParent.setStatus(PBomStatusEnum.WAIT_PUBLISH.getValue()); + pBomParent.setStatus(PBomStatusEnum.PUBLISH.getValue()); pBomParent.setLastVersionIs(1); pBomParent.setFacCode(facCode); pBomParent.setTechnologyUserCode(SessionUtil.getUserCode()); @@ -163,6 +168,8 @@ public class ChangeImpactUpgrade extends EBomToPbomBase { oldParent.setExpireEndTime(LocalDateTime.now()); oldParent.setLastVersionIs(0); this.pBomParentResult.add(oldParent); + this.oldPBomList.add(oldParent); + } this.pBomParentResult.add(pBomParent); return pBomParent; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java index 811f7be7..26b1b074 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java @@ -460,10 +460,15 @@ public abstract class EBomToPbomBase { private void buildChangeImpactEntity(BomNewEbomVirtualPackageCompositionEntity v, BomNewEbomParentVO vo) { - List checkExists = upgradeChangeResult.stream().filter(u -> u.getMaterialNo().equals(v.getVirtualPackageMaterialNo()) && u.getRelMaterialNo().equals(vo.getMaterialNo())).collect(Collectors.toList()); + List checkExists = upgradeChangeResult.stream().filter(u -> u.getMaterialNo().equals(v.getVirtualPackageMaterialNo())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(checkExists)) { return; } + List noHanlderV = SpringUtil.getBean(BomNewEbomUpgradeChangeService.class).lambdaQuery().eq(BomNewEbomUpgradeChangeEntity::getMaterialNo, v.getVirtualPackageMaterialNo()) + .eq(BomNewEbomUpgradeChangeEntity::getStatus, 0).list(); + if (CollUtil.isNotEmpty(noHanlderV)) { + return; + } BomNewEbomUpgradeChangeEntity changeEntity = new BomNewEbomUpgradeChangeEntity(); changeEntity.setRowId(IdWorker.getId()); changeEntity.setMaterialNo(v.getVirtualPackageMaterialNo());