From b2e18860125ea5235cb9793043fe67985faa6893 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 19 十二月 2025 10:26:40 +0800
Subject: [PATCH] 更新接口
---
WebApi/Gs.Sys/Services/FmController.cs | 190 +----------------------------------------------
1 files changed, 4 insertions(+), 186 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index c9a4a11..5346aa8 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -228,138 +228,7 @@
return isAdmin;
}
- /* #region 鍙戦�乪rp鏂扮増鏈�
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="model">keyType:1瀹℃牳锛�0鍙嶅鏍�</param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public string SendErp([FromBody] dynamic model)
- {
- //string keyGuid = model.keyGuid; 鍘熺敓涓婚敭
- //string keyUserGuid = model.keyUserGuid;鎿嶄綔鐢ㄦ埛
- //string keyProduce = model.keyProduce;瀛樺偍杩囩▼鍚�
- //string keyTaskName = model.keyTaskName;浠诲姟鍚�
- //string keyChild = model.keyChild;浠诲姟瀛愯妭鐐瑰悕
- //string keyMeth = model.keyMeth;鏂规硶鍚�
- //string keyNo = model.keyNo;鍗曟嵁缂栧彿
- int _rtnInt = 0;
- string _rtnStr = "";
- try
- {
- string _erpJson = GetErpParam(model);
- if (_erpJson.Length <= 0)
- return "-1璇诲彇erp鍙傛暟澶辫触锛�";
- string keyUserGuid = model.keyUserGuid;
- string keyGuid = model.keyGuid;
- string keyNo = model.keyNo;
- string idtype = model.idtype;//2浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
-
- if (keyGuid.Length != 36)
- keyGuid = "00000000-0000-0000-0000-000000000000";
- if (string.IsNullOrEmpty(idtype))
- (_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson, keyUserGuid, keyGuid, keyNo);
- else
- (_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson, keyUserGuid, keyGuid, keyNo, 2);
- }
- catch (Exception ex)
- {
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "Fm SendErp:" + ex.Message);
- return "鍙戦�乪rp澶辫触:" + ex.Message;
- }
- if (_rtnInt <= 0)
- {
- return "鍙戦�乪rp澶辫触:" + _rtnStr;
- }
- return _rtnStr;
- }
-
- /// <summary>
- /// 鏋勫缓erp鍙傛暟
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- private string GetErpParam(dynamic model)
- {
- string keyGuid = model.keyGuid;
- string keyUserGuid = model.keyUserGuid;
- string keyProduce = model.keyProduce;
- string keyTaskName = model.keyTaskName;
- string keyChild = model.keyChild;
- string keyMeth = model.keyMeth;
- string keyNo = model.keyNo;
- string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
-
- if (keyMeth.ToUpper() == "delete".ToUpper())
- return "";
- try
- {
- System.Data.DataSet dset = new System.Data.DataSet();
- SqlParameter[] parameters =
- {
- new("@inOrderGuid", keyGuid),
- new("@inEdtUserGuid", keyUserGuid),
- new("@keyMeth", keyMeth.ToLower()),
- };
- dset = DbHelperSQL.RunProcedure(keyProduce, parameters, "0");
- if (dset == null)
- return "";
- if (dset.Tables.Count <= 0)
- return "";
- if (dset.Tables[0].Rows.Count <= 0)
- return "";
- //杩欐槸鏅�氱殑鎺ュ彛
- if (string.IsNullOrEmpty(idtype))
- {
- string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
- dynamic _datajson = new ExpandoObject();
- if (dset.Tables.Count > 1)
- {
- //杩欐槸杩欐槸鏅�氱殑鎺ュ彛閲岀殑缁撴锛岀粨鏋勫拰鍏跺畠涓嶄竴鏍�
- if (keyMeth.ToLower() == "toclose".ToLower() || keyMeth.ToLower() == "closure".ToLower() || keyMeth.ToLower() == "unfinish")
- {
- _datajson = dset.Tables[1].Rows[0].RowToDynamic();
- }
- else
- {
- _datajson = dset.Tables[0].Rows[0].RowToDynamic();
- List<dynamic> _lst = dset.Tables[1].TableToDynamicList();
- ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
- }
- }
- var _obj = new
- {
- mesid = _mesGuid,
- taskname = keyTaskName,
- optype = keyMeth,
- datajson = JsonConvert.SerializeObject(_datajson),
- };
- return JsonConvert.SerializeObject(_obj);
- }
- //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
- List<dynamic> _datajson22 = new List<dynamic>();
- dynamic _ob = new ExpandoObject();
- _ob.ENTRY = dset.Tables[0].TableToDynamicList();
- _datajson22.Add(_ob);
- var _obj22 = new
- {
- taskname = keyTaskName,
- idtype = idtype,
- datajson = JsonConvert.SerializeObject(_datajson22),
- };
- return JsonConvert.SerializeObject(_obj22);
- }
- catch (Exception ex)
- {
- Gs.Toolbox.LogHelper.Debug(this.ToString(), ex.Message);
- throw ex;
- }
- }
- #endregion
- */
-
+
#region 鍙戦�乪rp鏂扮増鏈�
/// <summary>
@@ -389,15 +258,8 @@
string _rtnStr = "";
try
{
- // 璁板綍鏂规硶鍏ュ彛鍙傛暟
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp寮�濮� - keyGuid:{model.keyGuid}, keyNo:{model.keyNo}, keyMeth:{model.keyMeth}, keyProduce:{model.keyProduce}, keyUrl:{model.keyUrl}");
-
// 鏋勫缓ERP璇锋眰鍙傛暟
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "SendErp - 寮�濮嬭皟鐢℅etErpParam");
string _erpJson = GetErpParam(model);
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp - GetErpParam杩斿洖锛孞SON闀垮害:{_erpJson.Length}, 鍓�100瀛楃:{(_erpJson.Length > 100 ? _erpJson.Substring(0, 100) : _erpJson)}");
if (_erpJson.Length <= 0)
return "-1璇诲彇erp鍙傛暟澶辫触锛�";
string keyUserGuid = model.keyUserGuid;
@@ -405,25 +267,18 @@
string keyNo = model.keyNo;
string idtype = model.idtype; // 浠呭湪鏇存柊宸ュ崟鐘舵�佹椂浣跨敤
string keyUrl = model.keyUrl;
+
if (string.IsNullOrEmpty(idtype))
{
// 甯歌鎺ュ彛锛氭寜鎿嶄綔绫诲瀷鎺ㄩ�佸崟鏉′笟鍔℃暟鎹�
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp - 寮�濮嬭皟鐢℉ttpPostErp(甯歌鎺ュ彛) - keyUserGuid:{keyUserGuid}, keyGuid:{keyGuid}, keyNo:{keyNo}, urlType:0, keyUrl:{keyUrl}");
(_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson,
keyUserGuid, keyGuid, keyNo, 0, keyUrl);
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp - HttpPostErp杩斿洖 - _rtnInt:{_rtnInt}, _rtnStr:{_rtnStr}");
}
else
{
// 甯dtype鐨勮姹傜敤浜庣壒娈婃祦绋嬶紙濡傚叧闂�佸弽鍏抽棴锛夛紝ERP闇�瑕侀澶栫殑鐘舵�佹爣璁�
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp - 寮�濮嬭皟鐢℉ttpPostErp(鐗规畩娴佺▼) - keyUserGuid:{keyUserGuid}, keyGuid:{keyGuid}, keyNo:{keyNo}, urlType:2, keyUrl:{keyUrl}, idtype:{idtype}");
(_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson,
keyUserGuid, keyGuid, keyNo, 2, keyUrl);
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"SendErp - HttpPostErp杩斿洖 - _rtnInt:{_rtnInt}, _rtnStr:{_rtnStr}");
}
}
catch (Exception ex)
@@ -461,16 +316,9 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype; // 浠呭湪鏇存柊宸ュ崟鐘舵�佹椂浣跨敤
-
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam寮�濮� - keyGuid:{keyGuid}, keyMeth:{keyMeth}, keyProduce:{keyProduce}, keyTaskName:{keyTaskName}, idtype:{idtype}");
-
if (keyMeth.ToUpper() == "delete".ToUpper())
- {
// 鍒犻櫎鎿嶄綔鏃犻渶鍚慐RP鎺ㄩ�佹暟鎹紝鍙渶杩斿洖绌轰覆
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 鍒犻櫎鎿嶄綔锛岃繑鍥炵┖涓�");
return "";
- }
try
{
System.Data.DataSet dset = new System.Data.DataSet();
@@ -481,53 +329,31 @@
new("@keyMeth", keyMeth.ToLower()),
};
// 璋冪敤涓氬姟瀹氫箟鐨勫瓨鍌ㄨ繃绋嬶紝灏哅ES鏁版嵁鎵撳寘缁橢RP
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - 寮�濮嬭皟鐢ㄥ瓨鍌ㄨ繃绋�:{keyProduce}, 鍙傛暟:@inOrderGuid={keyGuid}, @inEdtUserGuid={keyUserGuid}, @keyMeth={keyMeth.ToLower()}");
dset = DbHelperSQL.RunProcedure(keyProduce, parameters, "0");
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - 瀛樺偍杩囩▼杩斿洖锛孌ataSet琛ㄦ暟閲�:{(dset == null ? 0 : dset.Tables.Count)}");
if (dset == null)
- {
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - DataSet涓簄ull锛岃繑鍥炵┖涓�");
return "";
- }
if (dset.Tables.Count <= 0)
- {
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - DataSet琛ㄦ暟閲忎负0锛岃繑鍥炵┖涓�");
return "";
- }
if (dset.Tables[0].Rows.Count <= 0)
- {
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 绗竴寮犺〃琛屾暟涓�0锛岃繑鍥炵┖涓�");
return "";
- }
-
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - 绗竴寮犺〃琛屾暟:{dset.Tables[0].Rows.Count}, 鍒楁暟:{dset.Tables[0].Columns.Count}");
-
// 甯歌鎺ュ彛澶勭悊閫昏緫
if (string.IsNullOrEmpty(idtype))
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 甯歌鎺ュ彛澶勭悊閫昏緫");
// 甯歌鍑哄弬锛氱涓�寮犺〃鏄富鏁版嵁锛岀浜屽紶琛紙鑻ュ瓨鍦級鏄瓙琛ㄩ泦鍚�
string _mesGuid = dset.Tables[0].Rows[0][0].ToString();
dynamic _datajson = new ExpandoObject();
if (dset.Tables.Count > 1)
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - 澶氳〃杩斿洖锛岀浜屽紶琛ㄨ鏁�:{dset.Tables[1].Rows.Count}");
// 澶氳〃杩斿洖鏃讹紝闇�瑕佹妸瀛愯〃闆嗗悎鎸傚埌datajson涓�
// 缁撴鎿嶄綔鐨勭粨鏋勪笌鍏朵粬涓嶄竴鏍凤紝鐗规畩澶勭悊
if (keyMeth.ToLower() == "toclose".ToLower() ||
keyMeth.ToLower() == "closure".ToLower() ||
keyMeth.ToLower() == "unfinish")
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 缁撴鎿嶄綔锛屼娇鐢ㄧ浜屽紶琛�");
_datajson = dset.Tables[1].Rows[0].RowToDynamic();
}
else
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 甯歌澶氳〃锛屼富琛�+瀛愯〃缁撴瀯");
_datajson = dset.Tables[0].Rows[0].RowToDynamic();
List<dynamic> _lst =
dset.Tables[1].TableToDynamicList();
@@ -537,7 +363,6 @@
}
else if (dset.Tables.Count == 1)
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 鍗曡〃杩斿洖");
_datajson = dset.Tables[0].Rows[0].RowToDynamic();
}
@@ -549,14 +374,10 @@
// datajson = JsonConvert.SerializeObject(_datajson),
// };
// return JsonConvert.SerializeObject(_obj);
- string jsonResult = JsonConvert.SerializeObject(_datajson);
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - 甯歌鎺ュ彛JSON鏋勫缓瀹屾垚锛岄暱搴�:{jsonResult.Length}");
- return jsonResult;
+ return JsonConvert.SerializeObject(_datajson);
}
// 璁㈠崟鍥炰紶鏍囪瘑澶勭悊閫昏緫锛堝甫idtype锛�
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetErpParam - 璁㈠崟鍥炰紶鏍囪瘑澶勭悊閫昏緫(idtype)");
List<dynamic> _datajson22 = new List<dynamic>();
dynamic _ob = new ExpandoObject();
_ob.ENTRY = dset.Tables[0].TableToDynamicList();
@@ -568,10 +389,7 @@
// datajson = JsonConvert.SerializeObject(_datajson22),
// };
// return JsonConvert.SerializeObject(_obj22);
- string jsonResult22 = JsonConvert.SerializeObject(_datajson22);
- Gs.Toolbox.LogHelper.Debug(this.ToString(),
- $"GetErpParam - idtype鎺ュ彛JSON鏋勫缓瀹屾垚锛岄暱搴�:{jsonResult22.Length}");
- return jsonResult22;
+ return JsonConvert.SerializeObject(_datajson22);
}
catch (Exception ex)
{
--
Gitblit v1.9.3