From 59386a517c10b0590920344c442757858c22806d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 27 May 2024 14:18:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(ebom):=2031=E7=BC=96=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=99=9A=E6=8B=9F=E5=8C=85=E6=97=B6=EF=BC=8C=E7=9B=B4?= =?UTF-8?q?=E5=8F=91=E5=8C=85=E4=B9=9F=E7=94=9F=E6=88=90parent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BomNewEbomGenerateVirtualPackageServiceFor31Impl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java index 054f3afe..a5d5383e 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomGenerateVirtualPackageServiceFor31Impl.java @@ -200,6 +200,7 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew //处理直发包 oldDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, false); newDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, true); + updateParentVirtualPackage(oldDrawingNo, newDrawingNo); updateChildVirtualPackage(fp.getRowId(), oldDrawingNo, newDrawingNo); //处理制作包 oldDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.MAKING_PACKAGE, false); @@ -311,6 +312,7 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew //处理直发包 oldDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, true); newDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, false); + updateParentVirtualPackage(oldDrawingNo, newDrawingNo); updateChildVirtualPackage(fp.getRowId(), oldDrawingNo, newDrawingNo); //处理制作包 oldDrawingNo = buildDrawingNo(root.getDrawingNo(), child.getMaterialName(), VirtualPackageTypeEnum.MAKING_PACKAGE, true); @@ -336,7 +338,8 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew child.setModifyTime(LocalDateTime.now()); childrenForUpdate.add(child); //直发包 - buildVirtualPackage(false, qp1.getRowId(), root, child, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, "002"); + BomNewEbomChildEntity qc3 = buildVirtualPackage(false, qp1.getRowId(), root, child, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, "002"); + buildVirtualPackage(qp1, qc3); } private void build1020VirtualPackage(BomNewEbomParentEntity root, boolean mount, BomNewEbomChildEntity child) { @@ -352,7 +355,8 @@ public class BomNewEbomGenerateVirtualPackageServiceFor31Impl implements IBomNew childrenForUpdate.add(child); } //直发包 - buildVirtualPackage(true, xp1.getRowId(), root, child, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, "002"); + BomNewEbomChildEntity xc3 = buildVirtualPackage(true, xp1.getRowId(), root, child, VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE, "002"); + buildVirtualPackage(xp1, xc3); } private void selectedAll(BomNewEbomParentEntity root, BomNewEbomChildEntity child, ChildListForGenerateVirtualPackageVO old) {