From 09c2b1c8ee6d8b96df7ec344593c206ce6cc1f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 5 Aug 2024 23:10:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(pbom):=20=E8=A7=A3=E5=86=B3=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0SAP=E6=97=B6=E5=8F=91=E8=B4=A7=E5=8C=85?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E6=A0=B9=E8=8A=82=E7=82=B9=E6=97=B6=E6=89=BE?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9B=B4=E5=8F=91=E5=8C=85=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomExportToSAPImpl.java   | 6 ++++--
 1 file changed, 4 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 d444065d..a9d648ae 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
@@ -40,6 +40,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
     //是否是 一次性订单/配件销售订单
     private boolean isForSale = false;
     private boolean is21 = false;
+    private boolean is31 = false;
 
     private final String dateYMD = DateUtil.format(new Date(), "yyyyMMdd");
     private final Map<Long, List<T1ExtDTO>> cmap = new HashMap<>();
@@ -59,6 +60,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
     public List<OperationErrorMsgVO> export(Long rootBomRowId) {
         BomNewPbomParentEntity root = bomNewPbomParentService.getById(rootBomRowId);
         is21 = root.getMaterialNo().startsWith("21");
+        is31 = root.getMaterialNo().startsWith("31");
         List<BomNewPbomChildEntity> rcs = bomNewPbomChildService.lambdaQuery()
                 .eq(BomNewPbomChildEntity::getParentRowId, root.getRowId())
                 .orderByAsc(BomNewPbomChildEntity::getOrderNumber)
@@ -77,7 +79,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
         List<OperationErrorMsgVO> liErrMsg = null;
         try {
             Long ddpRowId = null;
-            if (is21) {
+            if (!is31) {
                 //选出直发包
                 ddpRowId = getZFBBomRowId(rcs);
             }
@@ -85,7 +87,7 @@ public class BomNewPbomExportToSAPImpl implements IBomNewPbomExportToSAP {
                 BomNewPbomParentEntity cp = getParent(it);
                 addToT1(convert(cp, it, root.getMaterialNo(), false));
                 if (Objects.nonNull(cp)) {
-                    if (is21) {
+                    if (!is31) {
                         buildChildrenForSap(ddpRowId, cp, it, false);
                     } else {
                         //选出直发包