From 1f2ff739476d911ccdb02498e702270f5fceca78 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 8 Aug 2024 14:32:43 +0800
Subject: [PATCH] =?UTF-8?q?103=E6=94=B6=E8=B4=A7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 op-modules/op-job/src/main/resources/bootstrap.yml   | 12 ++++++------
 .../com/op/sap/service/impl/SapItemSyncImpl.java     | 10 ++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml
index e2706f6d..9e64e0ff 100644
--- a/op-modules/op-job/src/main/resources/bootstrap.yml
+++ b/op-modules/op-job/src/main/resources/bootstrap.yml
@@ -13,15 +13,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
       config:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
index b4c109f3..6f12c417 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
@@ -636,8 +636,14 @@ public class SapItemSyncImpl implements SapItemSyncService {
             String MESSAGE = func.getExportParameterList().getString("L_MSG");
             String MATERIALDOCUMENT = func.getExportParameterList().getString("MATERIALDOCUMENT");
             String MATDOCUMENTYEAR = func.getExportParameterList().getString("MATDOCUMENTYEAR");
-            System.out.println(RETCODE+"/" +MESSAGE+"/" +MATERIALDOCUMENT+"/" +MATDOCUMENTYEAR);
-            return R.ok();
+            log.info("暂收结果结果-----" + RETCODE+"/" +MESSAGE+"/" +MATERIALDOCUMENT+"/" +MATDOCUMENTYEAR);
+            if((Constants.FAIL).equals(Integer.parseInt(RETCODE))){
+                return R.fail(MESSAGE);
+            }
+            Map Resmap = new HashMap();
+            Resmap.put("MATERIALDOCUMENT", MATERIALDOCUMENT);
+            Resmap.put("MATDOCUMENTYEAR", MATDOCUMENTYEAR);
+            return R.ok(Resmap, MESSAGE);
         } catch (Exception e) {
             log.error(e.getMessage());
             return R.fail(e.getMessage());