From 7ff168fd1a42858b2612183bafc11b3129edeeec 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, 14 Jun 2024 09:01:15 +0800
Subject: [PATCH] =?UTF-8?q?optimize(=E7=A7=BB=E5=8A=A8=E7=A0=B4mbom):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5SAP=E7=8A=B6=E6=80=81=E5=80=BC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/constant/OptionalBomConstant.java | 12 ++++++++++++
 .../bomnew/service/OptionalMbomMaterialService.java  | 11 +++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java
index fda616a3..98dc306d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/OptionalBomConstant.java
@@ -133,6 +133,18 @@ public class OptionalBomConstant {
 
     }
 
+    @AllArgsConstructor
+    @Getter
+    public enum UploadSapStatusEnum {
+        //是否导入sap(0 :否 1: 是)
+        SAP_0(0, "未导入"),
+        SAP_1(1, "已导入"),
+        SAP_2(2, "导入中"),
+        SAP_3(3, "部分导入失败"),
+        SAP_4(4, "全部导入失败");
 
+        private final Integer value;
+        private final String description;
+    }
 
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
index d5bb1778..de2d248e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java
@@ -18,7 +18,6 @@ import com.nflg.product.base.core.conmon.util.SessionUtil;
 import com.nflg.product.base.core.exception.NflgBusinessException;
 import com.nflg.product.bomnew.constant.BomConstant;
 import com.nflg.product.bomnew.constant.OptionalBomConstant;
-import com.nflg.product.bomnew.constant.SapStatusEnum;
 import com.nflg.product.bomnew.mapper.master.OptionalMbomMaterialMapper;
 import com.nflg.product.bomnew.pojo.dto.OptionalMbomMaterialAddDTO;
 import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO;
@@ -164,15 +163,15 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
 
         //log.info(JSON.toJSONString(result));
 
-        SapStatusEnum state = SapStatusEnum.PUB_ERROR_ALL;
+        OptionalBomConstant.UploadSapStatusEnum state = OptionalBomConstant.UploadSapStatusEnum.SAP_4;
         List<OperationErrorMsgVO> liErrMsg = null;
         try {
-            updateSapState(entity.getRootRowId(), SapStatusEnum.PUB_RUNNING);
+            updateSapState(entity.getRootRowId(), OptionalBomConstant.UploadSapStatusEnum.SAP_2);
             liErrMsg = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(result, null);
             if (CollUtil.isEmpty(liErrMsg)) {
-                state = SapStatusEnum.PUB_SUCCESS;
+                state = OptionalBomConstant.UploadSapStatusEnum.SAP_1;
             } else if (result.getT1().size() != liErrMsg.size()) {
-                state = SapStatusEnum.PUB_ERROR;
+                state = OptionalBomConstant.UploadSapStatusEnum.SAP_3;
             }
         } finally {
             updateSapState(entity.getRootRowId(), state);
@@ -180,7 +179,7 @@ public class OptionalMbomMaterialService extends ServiceImpl<OptionalMbomMateria
         return ResultVO.success(liErrMsg);
     }
 
-    private void updateSapState(Long rootBomRowId, SapStatusEnum sapState) {
+    private void updateSapState(Long rootBomRowId, OptionalBomConstant.UploadSapStatusEnum sapState) {
         SpringUtil.getBean(OptionalEbomConfigService.class)
                 .lambdaUpdate()
                 .eq(OptionalEbomConfigEntity::getRowId, rootBomRowId)