From 5707781039b9d902ce1d2d6727fba65bbab14574 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 13 九月 2025 17:02:06 +0800
Subject: [PATCH] 异常单回滚
---
WebApi/Gs.Sys/Services/FmController.cs | 74 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index c6b5389..974f493 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -176,6 +176,41 @@
"璇诲彇澶辫触锛�");
}
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<string> GetModelByVersion([FromBody] dynamic model)
+ {
+ string formPath = model.formPath.ToString();
+ string strMsg = "";
+ SqlParameter[] parameters =
+ {
+ new("@formPath", formPath),
+ new("@userGuid", _userGuid),
+ };
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.RunProcedure("[fm_get_layout_ver]", parameters, "0");
+ if (dset != null && dset.Tables.Count > 0
+ )
+ {
+ strMsg = dset.Tables[0].Rows[0][0].ToString();
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message+ ",formPath:"+ formPath+ ",_userGuid:"+ _userGuid);
+
+ }
+ return ReturnDto<string>.QuickReturn(strMsg, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ }
+
+
#endregion
private int? chkAdmin()
@@ -224,11 +259,11 @@
if (string.IsNullOrEmpty(idtype))
(_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson, keyUserGuid, keyGuid, keyNo);
else
- (_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson, keyUserGuid, keyGuid, keyNo,2);
+ (_rtnInt, _rtnStr) = InterfaceUtil.HttpPostErp(_erpJson, keyUserGuid, keyGuid, keyNo, 2);
}
catch (Exception ex)
{
- Gs.Toolbox.LogHelper.Debug(this.ToString(), "SendErp:" + ex.Message);
+ Gs.Toolbox.LogHelper.Debug(this.ToString(), "Fm SendErp:" + ex.Message);
return "鍙戦�乪rp澶辫触:" + ex.Message;
}
if (_rtnInt <= 0)
@@ -253,8 +288,8 @@
string keyMeth = model.keyMeth;
string keyNo = model.keyNo;
string idtype = model.idtype;//杩欎釜浠呬粎鏄洿鏂板伐鍗曠姸鎬佺殑鏃跺�欐湁
- //if (keyMeth.ToUpper() == "delete".ToUpper())
- // return "";
+ if (keyMeth.ToUpper() == "delete".ToUpper())
+ return "";
try
{
System.Data.DataSet dset = new System.Data.DataSet();
@@ -278,7 +313,7 @@
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();
@@ -296,16 +331,14 @@
taskname = keyTaskName,
optype = keyMeth,
datajson = JsonConvert.SerializeObject(_datajson),
- // datajson = (_datajson),
};
return JsonConvert.SerializeObject(_obj);
}
//杩欐槸璁㈠崟鍥炰紶鏍囪瘑
List<dynamic> _datajson22 = new List<dynamic>();
- dynamic _ob= new ExpandoObject();
+ dynamic _ob = new ExpandoObject();
_ob.ENTRY = dset.Tables[0].TableToDynamicList();
_datajson22.Add(_ob);
-
var _obj22 = new
{
taskname = keyTaskName,
@@ -350,7 +383,8 @@
if (_sb.Length > 0)
_sb.Append("~");
_sb.Append(_line);
- };
+ }
+ ;
var lst = new List<dynamic>();
SqlParameter[] parameters =
{
@@ -403,15 +437,23 @@
{
Gs.Toolbox.LogHelper.Debug(this.ToString(), "EditModel isAdmin error锛�" + ex.Message);
}
- Gs.Toolbox.DbHelperSQL.ExecuteSql("delete from [FM_QUERY_TABLE] where formPath=@formPath ", new SqlParameter[] { new SqlParameter("@formPath", formPath) });
- foreach (var _obj in model.list)
+ try
{
- System.Text.StringBuilder _sb = new System.Text.StringBuilder();
- _sb.Append("INSERT INTO [dbo].[FM_QUERY_TABLE]([guid],[formPath] ,[tableName] ,[lastUpdateBy] ,[lastUpdateDate],[tableOtherName])");
- _sb.Append(" values(newid(),'" + formPath + "','" + _obj.tableName + "','',getdate(),'" + _obj.tableOtherName + "')");
- arrayList.Add(_sb.ToString());
+ Gs.Toolbox.DbHelperSQL.ExecuteSql("delete from [FM_QUERY_TABLE] where formPath=@formPath ", new SqlParameter[] { new SqlParameter("@formPath", formPath) });
+ foreach (var _obj in model.list)
+ {
+ System.Text.StringBuilder _sb = new System.Text.StringBuilder();
+ _sb.Append("INSERT INTO [dbo].[FM_QUERY_TABLE]([guid],[formPath] ,[tableName] ,[lastUpdateBy] ,[lastUpdateDate],[tableOtherName])");
+ _sb.Append(" values(newid(),'" + formPath + "','" + _obj.tableName + "','',getdate(),'" + _obj.tableOtherName + "')");
+ arrayList.Add(_sb.ToString());
+ }
+ Gs.Toolbox.DbHelperSQL.ExecuteSqlTran(arrayList);
}
- Gs.Toolbox.DbHelperSQL.ExecuteSqlTran(arrayList);
+ catch (Exception ex)
+ {
+ m.outMsg = ex.Message;
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
+ }
m.outMsg = "鎿嶄綔鎴愬姛锛�";
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "鎿嶄綔鎴愬姛锛�");
}
--
Gitblit v1.9.3