From 06851c1b58258b05b954ea239e3f42b872f89ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 25 Jan 2024 15:06:50 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/PBom/TechnologyPackageParamBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/TechnologyPackageParamBuilder.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/TechnologyPackageParamBuilder.java index 15883eef..e214e9bf 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/TechnologyPackageParamBuilder.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/TechnologyPackageParamBuilder.java @@ -37,7 +37,7 @@ public class TechnologyPackageParamBuilder { BomNewPbomParentEntity parent; @Getter - List packageParent=null; + List packageParent=new ArrayList<>(); @Getter List packageChildren=new ArrayList<>(); @@ -110,7 +110,10 @@ public class TechnologyPackageParamBuilder { private BomNewPbomParentEntity buildParentForTechnologyPackage(){ - BomNewPbomParentEntity oldBom =SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, packageParam.getTechnologyPackageMaterialNo()).eq(BomNewPbomParentEntity::getLastVersionIs, 1).one(); + BomNewPbomParentEntity oldBom =SpringUtil.getBean(BomNewPbomParentService.class).lambdaQuery().eq(BomNewPbomParentEntity::getMaterialNo, packageParam.getTechnologyPackageMaterialNo()) + .eq(BomNewPbomParentEntity::getLastVersionIs, 1) + .eq(BomNewPbomParentEntity::getFacCode,parent.getFacCode()) + .one(); VUtils.isTure(Objects.nonNull(oldBom) && oldBom.getStatus()< PBomStatusEnum.PUBLISH.getValue()).throwMessage("该工艺包存在未发布的BOM版本"); @@ -133,8 +136,8 @@ public class TechnologyPackageParamBuilder { newBom.setDeptName(SessionUtil.getDepartName()); newBom.setCreatedBy(SessionUtil.getUserCode()); newBom.setCreatedTime(LocalDateTime.now()); - - if(Objects.isNull(oldBom)){ + newBom.setSourceRowId(0L); + if(Objects.nonNull(oldBom)){ oldBom.setLastVersionIs(0); SpringUtil.getBean(BomNewPbomParentService.class).updateById(oldBom); } @@ -162,6 +165,7 @@ public class TechnologyPackageParamBuilder { child.setCreatedBy(SessionUtil.getUserCode()); child.setCreatedTime(LocalDateTime.now()); child.setModifyTime(LocalDateTime.now()); + child.setSourceRowId(0L); this.packageChildren.add(child); } }