From 785e907aa09986218f9dc99486f98d9a68064597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 15 May 2024 09:38:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(pbom):=20pbom=E5=AF=BC=E5=85=A5=E5=88=B0SA?= =?UTF-8?q?P=E6=97=B6=EF=BC=8C=E5=B0=86=E6=89=80=E6=9C=89=E5=AD=90?= =?UTF-8?q?=E7=BA=A7=E5=8F=91=E8=B4=A7=E5=8C=85=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E5=B1=82=E5=88=B0=E9=A1=B6=E7=BA=A7=E5=8F=91=E8=B4=A7=E5=8C=85?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewPbomExportToSAPImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java index 6c30fb30..94ec3542 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomExportToSAPImpl.java @@ -145,11 +145,11 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { private void buildChildrenForSap(Long cRowId, BomNewPbomParentEntity p, BomNewPbomChildEntity c) { List cc = getChildren(p); for (BomNewPbomChildEntity it : cc) { - if (is21 && !isForSale && !Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue())) { + if (is21 && !isForSale && !Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) { return; } if (Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue())) { - if (Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue())) { + if (Objects.equals(c.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) { if (Objects.isNull(cRowId)) { LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), c.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); children.add(convert(it, c.getMaterialNo())); @@ -174,6 +174,9 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP { LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), c.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); children.add(convert(it, c.getMaterialNo())); } + } else if (!Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())) { + LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), c.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc()); + children.add(convert(it, c.getMaterialNo())); } List cp = getParents(it); cp.forEach(cpt -> {