From c6d9b3e0319f61a1273f3c2fa1adec61aa44a994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 16 Aug 2024 16:48:18 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E5=AF=BC=E5=85=A5SAP=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89bom?=
 =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E5=B0=86=E6=9D=A5=E6=BA=90=E6=98=AF?=
 =?UTF-8?q?SAP=E7=9A=84bom=E4=B8=A2=E5=BC=83=EF=BC=8C=E5=85=B6=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E5=88=B0SAP=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomExportToSAP.java  | 10 +++++-----
 .../bomnew/service/BomNewPbomExportToSAPImpl.java      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java
index efae505e..7be6dd49 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomExportToSAP.java
@@ -112,7 +112,7 @@ public class BomNewEbomExportToSAP {
 
     private void handlerItem(BomNewEbomChildEntity it, BomNewEbomParentEntity p) {
         LOGGER.debug("{} 添加物料 编号：{}，父级编号：{}，数量：{}，描述：{}", TAG, it.getMaterialNo(), p.getMaterialNo(), it.getNum().toString(), it.getMaterialDesc());
-        addToT1(convert(it, p.getMaterialNo(), Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())));
+        addToT1(convert(it, p, Objects.equals(it.getVirtualPartType(), VirtualPackageTypeEnum.DIRECT_DELIVERY_PACKAGE.getValue())));
         BomNewEbomParentEntity cp = getParent(it);
         if (Objects.nonNull(cp)) {
             buildChildrenForSap(cp);
@@ -142,16 +142,16 @@ public class BomNewEbomExportToSAP {
         }
     }
 
-    private T1ExtDTO convert(BomNewEbomChildEntity child, String parentMaterialNo, boolean isZFB) {
+    private T1ExtDTO convert(BomNewEbomChildEntity child, BomNewEbomParentEntity p, boolean isZFB) {
         T1ExtDTO t = new T1ExtDTO();
         t.setID(RandomUtil.randomNumbers(5));
-        t.setMATNR(parentMaterialNo);
+        t.setMATNR(p.getMaterialNo());
         t.setMENGE(child.getNum().toString());
         t.setPOSTP(child.getProjectType());
         t.setDATUM(dateYMD);
         t.setMEINS(child.getMaterialUnit());
         t.setIDNRK(child.getMaterialNo());
-        t.setIgnore(false);
+        t.setIgnore(Objects.equals(p.getSource(), EBomSourceEnum.FROM_SAP.getValue()));
         t.setZFB(isZFB);
         if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) {
             t.setIDNRK("");
@@ -168,7 +168,7 @@ public class BomNewEbomExportToSAP {
                 .eq(BomNewEbomParentEntity::getMaterialNo, c.getMaterialNo())
                 .eq(BomNewEbomParentEntity::getUserRootIs, 0)
                 .eq(BomNewEbomParentEntity::getStatus, EBomStatusEnum.PUBLISHED.getValue())
-                .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue())
+                //                .ne(BomNewEbomParentEntity::getSource, EBomSourceEnum.FROM_SAP.getValue())
                 .orderByDesc(BomNewEbomParentEntity::getCurrentVersion)
                 .last(" limit 1")
                 .one();
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 22612ba2..7a3e5475 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
@@ -195,7 +195,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
         t.setIDNRK(child.getMaterialNo());
         t.setZSORT(BomUtil.generateSapOrderNum(child.getProjectType(), child.getMaterialCategoryCode()
                 , child.getFacCode(), child.getMaterialNo(), Objects.isNull(parent) ? 0 : parent.getBomExist()));
-        t.setIgnore(ignore);
+        t.setIgnore(ignore || Objects.equals(parent.getSource(), PbomSourceEnum.FROM_SAP.getValue()));
         if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType())) {
             t.setIDNRK("");
             t.setPOTX1(child.getMaterialDesc());
@@ -282,7 +282,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
                 .eq(BomNewPbomParentEntity::getMaterialNo, child.getMaterialNo())
                 .ge(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue())
                 .eq(BomNewPbomParentEntity::getFacCode, child.getFacCode())
-                .ne(BomNewPbomParentEntity::getSource, PbomSourceEnum.FROM_SAP.getValue())
+                //                .ne(BomNewPbomParentEntity::getSource, PbomSourceEnum.FROM_SAP.getValue())
                 .orderByDesc(BomNewPbomParentEntity::getCurrentVersion)
                 .last(" limit 1")
                 .one();