From f2946889ea630e2d86bfafe348cf876b0094557a Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 20 Oct 2021 15:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=87=8D=E5=8F=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/service/impl/IntegrationLogServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java
index b4a9704b..699361a2 100644
--- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java
+++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/IntegrationLogServiceImpl.java
@@ -78,7 +78,9 @@ public class IntegrationLogServiceImpl extends ServiceImpl<IntegrationLogMapper,
             status = outHolder.value[1].getRet();
             message = outHolder.value[1].getMsg();
             if (!status.equals("S")) {
-                throw new BaseException("ERP接口返回错误消息:" + message);
+                byId.setResultMessage("ERP接口返回错误消息:" + message);
+                updateById(byId);
+                return "ERP接口返回错误消息:" + message;
             }
             byId.setStatus(status);
             byId.setResultMessage(message);
@@ -86,9 +88,7 @@ public class IntegrationLogServiceImpl extends ServiceImpl<IntegrationLogMapper,
         } catch (RemoteException e) {
             byId.setRequestDateTime(LocalDateTime.now());
             byId.setResultMessage("ERP接口错误：" + e.getMessage());
-//            updateById(byId);
             updateById(byId);
-//            throw new BaseException("ERP接口错误: " + e.getMessage());
             return e.getMessage();
         }
         return null;