From a4501b0013153ee105d65a8b9ae34f3998d60904 Mon Sep 17 00:00:00 2001
From: huawei <huawei@2214094776>
Date: 星期一, 01 十二月 2025 15:16:41 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnf/JH/JH_MesService
---
WebApi/Gs.Toolbox/InterfaceUtil.cs | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/WebApi/Gs.Toolbox/InterfaceUtil.cs b/WebApi/Gs.Toolbox/InterfaceUtil.cs
index 006c27a..f928d30 100644
--- a/WebApi/Gs.Toolbox/InterfaceUtil.cs
+++ b/WebApi/Gs.Toolbox/InterfaceUtil.cs
@@ -1,4 +1,4 @@
-锘縰sing Newtonsoft.Json;
+锘匡豢锘縰sing Newtonsoft.Json;
using System.Data.SqlClient;
using System.Dynamic;
using System.Net;
@@ -47,6 +47,10 @@
{
url = AppSettingsHelper.getValueByKey("TestErpUrl6");
}
+ else if (urlType == 101)
+ {
+ url = AppSettingsHelper.getValueByKey("TestErpUrl101");
+ }
HttpWebRequest request = null;
StreamWriter requestStream = null;
WebResponse response = null;
@@ -89,9 +93,36 @@
//{"msg":"鎿嶄綔鎴愬姛","code":200,"data":{"number":"CGSL168397","code":"200","id":"268781"}}
if (_rtn != -1)
{
- Result _result = JsonConvert.DeserializeObject<Result>(responseStr);
- if ("200".Equals(_result.code))
- _rtn = 1;
+ try
+ {
+ Result _result = JsonConvert.DeserializeObject<Result>(responseStr);
+
+ // 銆愪紭鍏堝垽鏂�慸ata.code锛圗RP鐪熸鐨勫鐞嗙粨鏋滐級
+ if (_result?.data != null && "200".Equals(_result.data.code))
+ {
+ _rtn = 1;
+ LogHelper.Debug(url, $"ERP澶勭悊鎴愬姛锛宒ata.code=200, number={_result.data.number}, id={_result.data.id}");
+ }
+ // 銆愰檷绾у垽鏂�戝鏋渄ata涓虹┖锛屽垯鍒ゆ柇澶栧眰code锛堝吋瀹规棫鎺ュ彛锛�
+ /* else if (_result != null && "200".Equals(_result.code))
+ {
+ _rtn = 1;
+ LogHelper.Debug(url, $"ERP澶栧眰杩斿洖鎴愬姛锛宑ode=200锛堟棤data灞傦紝鍙兘鏄棫鎺ュ彛锛�");
+ }*/
+ else
+ {
+ _rtn = -1;
+ string errorMsg = _result?.data?.code != null
+ ? $"ERP澶勭悊澶辫触锛宒ata.code={_result.data.code}"
+ : $"ERP澶勭悊澶辫触锛屽灞俢ode={_result?.code}";
+ LogHelper.Debug(url, errorMsg + $", msg={_result?.msg}, responseStr={responseStr}");
+ }
+ }
+ catch (Exception ex)
+ {
+ _rtn = -1;
+ LogHelper.Debug(url, $"ERP杩斿洖鏁版嵁瑙ｆ瀽澶辫触锛歿ex.Message}, responseStr={responseStr}");
+ }
}
sbLog.Append("," + DateTime.Now.ToString() + "缁撴潫鍙戦��");
if (_rtn > 0)
@@ -126,11 +157,34 @@
public class Result
{
/// <summary>
- /// 200鎴愬姛锛屽惁鍒欏け璐�
+ /// 200鎴愬姛锛屽惁鍒欏け璐ワ紙澶栧眰code锛�
/// </summary>
- ///
-
public string? msg { get; set; }
public string? code { get; set; }
- // public string? data { get; set; }
+
+ /// <summary>
+ /// data灞傦紝鍖呭惈鐪熸鐨凟RP澶勭悊缁撴灉
+ /// </summary>
+ public ErpData? data { get; set; }
+}
+
+/// <summary>
+/// ERP杩斿洖鐨刣ata灞傛暟鎹粨鏋�
+/// </summary>
+public class ErpData
+{
+ /// <summary>
+ /// ERP鍗曟嵁缂栧彿
+ /// </summary>
+ public string? number { get; set; }
+
+ /// <summary>
+ /// ERP澶勭悊缁撴灉浠ｇ爜锛�"200"鎴愬姛锛�
+ /// </summary>
+ public string? code { get; set; }
+
+ /// <summary>
+ /// ERP鍗曟嵁ID
+ /// </summary>
+ public string? id { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3