From 2466b022cc1b8cbece0201f13bea9558a5c231fc Mon Sep 17 00:00:00 2001
From: qianshijiang <1965297290@qq.com>
Date: Thu, 15 Jan 2026 17:42:37 +0800
Subject: [PATCH] =?UTF-8?q?erp=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-server/src/main/resources/application-dev.yml  |  6 ++++--
 .../src/main/resources/application-local.yml        |  6 ++++--
 .../com/zt/plat/module/erp/utils/ErpConfig.java     | 13 ++++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/base-server/src/main/resources/application-dev.yml b/base-server/src/main/resources/application-dev.yml
index 40e5341c..be0275dc 100644
--- a/base-server/src/main/resources/application-dev.yml
+++ b/base-server/src/main/resources/application-dev.yml
@@ -120,8 +120,10 @@ justauth:
 # erp相关配置
 erp:
   address: hana-dev.yncic.com
-  sapsys: ZTDEV203
-  secret-key: 123456789  # erp秘钥
+  sapsys: ZTQAS600  # 测试
+  #sapsys: ZTPRD800  # 正式
+  srcsys: JYGK
+  secret-key: JYGK  # erp秘钥
 
 eplat:
   share:
diff --git a/base-server/src/main/resources/application-local.yml b/base-server/src/main/resources/application-local.yml
index 1a090514..156d3006 100644
--- a/base-server/src/main/resources/application-local.yml
+++ b/base-server/src/main/resources/application-local.yml
@@ -104,8 +104,10 @@ zt:
 # erp相关配置
 erp:
   address: hana-dev.yncic.com
-  sapsys: ZTDEV203
-  secret-key: 123456789  # erp秘钥
+  sapsys: ZTQAS600  # 测试
+  #sapsys: ZTPRD800  # 正式
+  srcsys: JYGK
+  secret-key: JYGK  # erp秘钥
 
 eplat:
   share:
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
index c88b92bc..0e604bac 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
@@ -32,6 +32,9 @@ public class ErpConfig {
     @Value("${erp.sapsys:}")
     private String sapsys;
 
+    @Value("${erp.srcsys:JYGK}")
+    private String srcsys;
+
     @Value("${erp.secret-key:}")
     private String secretKey;
 
@@ -78,14 +81,14 @@ public class ErpConfig {
             boolean succeed = jsonResponse.getBoolean("succeed");
             if (succeed && "S".equals(dataObject.getString("E_FLAG"))) {
                 String flag = "S";
-                JSONArray E_RESP = dataObject.getJSONArray("E_DATA");
-                String E_MSG = dataObject.getString("E_MSG");
+                JSONArray E_RESP = dataObject.containsKey("E_DATA") ? dataObject.getJSONArray("E_DATA") : null;
+                String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") :  null;
                 resMap.put("E_RESP", E_RESP);
                 resMap.put("resStr", E_MSG);
                 resMap.put("flag", flag);
                 return resMap;
             } else {
-                String E_MSG = dataObject.getString("E_MSG");
+                String E_MSG = dataObject.containsKey("E_MSG") ? dataObject.getString("E_MSG") :  null;
                 String flag = "E";
                 resMap.put("E_RESP", null);
                 resMap.put("resStr", E_MSG);
@@ -110,14 +113,14 @@ public class ErpConfig {
             String uuid = UUID.randomUUID().toString();
             requestBody.put("uuid", uuid);
             requestBody.put("sapsys", sapsys);
-            requestBody.put("srcsys", "DSC");
+            requestBody.put("srcsys", srcsys);
             requestBody.put("funcnr", reqDTO.getFuncnr());
             requestBody.put("bskey", reqDTO.getBskey());
             requestBody.put("usrid", reqDTO.getUsrid());
             requestBody.put("usrnm", reqDTO.getUsrnm());
             // todo 密码另行约定
             if (StringUtils.isBlank(reqDTO.getSign())) {
-                requestBody.put("sign", DigestUtil.md5Hex(uuid + "DSC" + secretKey, StandardCharsets.UTF_8));
+                requestBody.put("sign", DigestUtil.md5Hex(uuid + srcsys + secretKey, StandardCharsets.UTF_8));
             } else {
                 requestBody.put("sign", reqDTO.getSign());
             }