From 1b3db8f5683373dd8e179b006e7314783dd1f9db Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 14:42:12 +0800
Subject: [PATCH] 文件补充

---
 WebApi/Gs.Sys/Services/FmController.cs |  103 +++++++++++++++------------------------------------
 1 files changed, 31 insertions(+), 72 deletions(-)

diff --git a/WebApi/Gs.Sys/Services/FmController.cs b/WebApi/Gs.Sys/Services/FmController.cs
index 8e5b3a8..23f55b6 100644
--- a/WebApi/Gs.Sys/Services/FmController.cs
+++ b/WebApi/Gs.Sys/Services/FmController.cs
@@ -176,40 +176,6 @@
                 "璇诲彇澶辫触锛�");
         }
 
-
-        /// <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);
-            }
-            return ReturnDto<string>.QuickReturn(strMsg, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
-        }
-
-
         #endregion
 
         private int? chkAdmin()
@@ -258,11 +224,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(), "Fm SendErp:" + ex.Message);
+                Gs.Toolbox.LogHelper.Debug(this.ToString(), "SendErp:" + ex.Message);
                 return "鍙戦�乪rp澶辫触:" + ex.Message;
             }
             if (_rtnInt <= 0)
@@ -287,8 +253,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();
@@ -312,7 +278,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();
@@ -324,27 +290,29 @@
                             ((IDictionary<string, object>)_datajson)[keyChild] = _lst;
                         }
                     }
-                    var _obj = new
-                    {
-                        mesid = _mesGuid,
-                        taskname = keyTaskName,
-                        optype = keyMeth,
-                        datajson = JsonConvert.SerializeObject(_datajson),
-                    };
-                    return JsonConvert.SerializeObject(_obj);
+                    //var _obj = new
+                    //{
+                    //    mesid = _mesGuid,
+                    //    taskname = keyTaskName,
+                    //    optype = keyMeth,
+                    //    datajson = JsonConvert.SerializeObject(),
+                    //   // datajson = (_datajson),
+                    //};
+                    return JsonConvert.SerializeObject(_datajson);
                 }
                 //杩欐槸璁㈠崟鍥炰紶鏍囪瘑
                 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,
-                    idtype = idtype,
-                    datajson = JsonConvert.SerializeObject(_datajson22),
-                };
-                return JsonConvert.SerializeObject(_obj22);
+
+                //var _obj22 = new
+                //{
+                //    taskname = keyTaskName,
+                //    idtype = idtype,
+                //    datajson = JsonConvert.SerializeObject(_datajson22),
+                //};
+                return JsonConvert.SerializeObject(_datajson22);
             }
             catch (Exception ex)
             {
@@ -382,8 +350,7 @@
                 if (_sb.Length > 0)
                     _sb.Append("~");
                 _sb.Append(_line);
-            }
-            ;
+            };
             var lst = new List<dynamic>();
             SqlParameter[] parameters =
             {
@@ -436,23 +403,15 @@
             {
                 Gs.Toolbox.LogHelper.Debug(this.ToString(), "EditModel isAdmin error锛�" + ex.Message);
             }
-            try
+            Gs.Toolbox.DbHelperSQL.ExecuteSql("delete from [FM_QUERY_TABLE] where formPath=@formPath ", new SqlParameter[] { new SqlParameter("@formPath", formPath) });
+            foreach (var _obj in model.list)
             {
-                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);
+                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());
             }
-            catch (Exception ex)
-            {
-                m.outMsg = ex.Message;
-                return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
-            }
+            Gs.Toolbox.DbHelperSQL.ExecuteSqlTran(arrayList);
             m.outMsg = "鎿嶄綔鎴愬姛锛�";
             return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "鎿嶄綔鎴愬姛锛�");
         }

--
Gitblit v1.9.3