From 1cb38690523d755ec422668041c1c86a6e91347b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 29 May 2024 11:42:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0sap=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 ++
 .../service/BomNewEbomParentService.java      | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 405f68f5..ed97a662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 target
 .idea
 logs
+/ABAP_AS_WITH_POOL.jcoDestination
+/dev_jco_rfc.trc
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 5c92ae98..4a9dae7a 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -976,24 +976,28 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             } else if (sapDto.getT1().size() != liErrMsg.size()) {
                 state = SapStatusEnum.PUB_ERROR;
             }
-            if (CollUtil.isNotEmpty(liErrMsg)) {
-                bomNewSapErrorMsgService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewSapErrorMsgEntity.class)
-                        .eq(BomNewSapErrorMsgEntity::getTargetRowId, rootBomRowId));
-            } else {
-                BomNewSapErrorMsgEntity sapErrorMsgEntity = new BomNewSapErrorMsgEntity();
-                sapErrorMsgEntity.setTargetRowId(rootBomRowId);
-                sapErrorMsgEntity.setType(0);
-                sapErrorMsgEntity.setData(JSON.toJSONString(liErrMsg));
-                sapErrorMsgEntity.setCreatedName(SessionUtil.getRealName());
-                sapErrorMsgEntity.setCreatedTime(LocalDateTime.now());
-                bomNewSapErrorMsgService.saveOrUpdate(sapErrorMsgEntity);
-            }
+            saveSapErrorMsg(rootBomRowId, liErrMsg);
         } finally {
             updateSapState(rootBomRowId, state);
         }
         return liErrMsg;
     }
 
+    private void saveSapErrorMsg(Long rootBomRowId, List<OperationErrorMsgVO> liErrMsg) {
+        bomNewSapErrorMsgService.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewSapErrorMsgEntity.class)
+                .eq(BomNewSapErrorMsgEntity::getTargetRowId, rootBomRowId));
+
+        if (CollUtil.isNotEmpty(liErrMsg)) {
+            BomNewSapErrorMsgEntity sapErrorMsgEntity = new BomNewSapErrorMsgEntity();
+            sapErrorMsgEntity.setTargetRowId(rootBomRowId);
+            sapErrorMsgEntity.setType(0);
+            sapErrorMsgEntity.setData(JSON.toJSONString(liErrMsg));
+            sapErrorMsgEntity.setCreatedName(SessionUtil.getRealName());
+            sapErrorMsgEntity.setCreatedTime(LocalDateTime.now());
+            bomNewSapErrorMsgService.saveOrUpdate(sapErrorMsgEntity);
+        }
+    }
+
     private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
         lambdaUpdate().eq(BomNewEbomParentEntity::getRowId, rootBomRowId)
                 .set(BomNewEbomParentEntity::getSapTime, LocalDateTime.now())