From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 WebApi/Gs.Wom/Service/FanGongManager.cs |  301 ++++++++++++++++++++++++-------------------------
 1 files changed, 147 insertions(+), 154 deletions(-)

diff --git a/WebApi/Gs.Wom/Service/FanGongManager.cs b/WebApi/Gs.Wom/Service/FanGongManager.cs
index 3993b3a..702a04d 100644
--- a/WebApi/Gs.Wom/Service/FanGongManager.cs
+++ b/WebApi/Gs.Wom/Service/FanGongManager.cs
@@ -1,43 +1,43 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
+锘縰sing Gs.Toolbox.ApiCore.Common.Mvc;
 using Gs.Toolbox;
-using Gs.Toolbox.ApiCore.Abstract.Mvc;
-using Gs.Toolbox.ApiCore.Common.Mvc;
-using Gs.Toolbox.ApiCore.Group;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Data;
+using System.Dynamic;
+using Gs.Toolbox.ApiCore.Abstract.Mvc;
+using System.Data.SqlClient;
+using Gs.Toolbox.ApiCore.Group;
 
-namespace Gs.Wom.Service;
-
-[ApiGroup(ApiGroupNames.QC)]
-public class FanGongManager : IRomteService
+namespace Gs.Wom.Service
 {
-    private readonly IHttpContextAccessor _http;
-
-    private readonly string _userCode, _userGuid, _orgFids;
-
-    public FanGongManager(IHttpContextAccessor httpContextAccessor)
+    [ApiGroup(ApiGroupNames.QC)]
+    public class FanGongManager : IRomteService
     {
-        _http = httpContextAccessor;
-        (_userCode, _userGuid, _orgFids) =
-            UtilityHelper.GetUserGuidAndOrgGuid(_http);
-    }
+        private readonly IHttpContextAccessor _http;
 
-    /// <summary>
-    ///     璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    [RequestMethod(RequestMethods.POST)]
-    public ReturnDto<PageList<dynamic>> GetListPage([FromBody] dynamic model)
-    {
-        int currentPage = model.currentPage;
-        int everyPageSize = model.everyPageSize;
-        string sortName = model.sortName;
-        string keyWhere = model.keyWhere;
-        SqlParameter[] parameters =
+        private readonly string _userCode, _userGuid, _orgFids;
+
+        public FanGongManager(IHttpContextAccessor httpContextAccessor)
         {
+            _http = httpContextAccessor;
+            (_userCode, _userGuid, _orgFids) =
+                UtilityHelper.GetUserGuidAndOrgGuid(_http);
+        }
+
+        /// <summary>
+        ///     璇诲彇鍒楄〃锛屾敮鎸佸垎椤�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [RequestMethod(RequestMethods.POST)]
+        public ReturnDto<PageList<dynamic>> GetListPage([FromBody] dynamic model)
+        {
+            int currentPage = model.currentPage;
+            int everyPageSize = model.everyPageSize;
+            string sortName = model.sortName;
+            string keyWhere = model.keyWhere;
+            SqlParameter[] parameters =
+            {
             new("@inCurrentPage", currentPage),
             new("@inEveryPageSize", everyPageSize),
             new("@inSortName", sortName),
@@ -49,147 +49,140 @@
             new("@inP3", ""),
             new("@inP4", "")
         };
-        var dset = new DataSet();
-        var _pglist = new PageList<dynamic>
-        {
-            total = 0,
-            everyPageSize = 0,
-            pages = 0,
-            list = new List<dynamic>()
-        };
-        try
-        {
-            dset = DbHelperSQL.RunProcedure("prc_fgd_lst", parameters, "0");
-            if (dset != null && dset.Tables.Count > 0 &&
-                dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+            var dset = new DataSet();
+            var _pglist = new PageList<dynamic>
             {
-                var intTotal =
-                    int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
-                var pages = intTotal % everyPageSize != 0
-                    ? intTotal / everyPageSize + 1
-                    : intTotal / everyPageSize;
-                _pglist.total = intTotal;
-                _pglist.everyPageSize = everyPageSize;
-                _pglist.pages = pages;
-                var _dy = dset.Tables[0].TableToDynamicList();
-                _pglist.list = _dy;
+                total = 0,
+                everyPageSize = 0,
+                pages = 0,
+                list = new List<dynamic>()
+            };
+            try
+            {
+                dset = DbHelperSQL.RunProcedure("prc_fgd_lst", parameters, "0");
+                if (dset != null && dset.Tables.Count > 0 &&
+                    dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+                {
+                    var intTotal =
+                        int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+                    var pages = intTotal % everyPageSize != 0
+                        ? intTotal / everyPageSize + 1
+                        : intTotal / everyPageSize;
+                    _pglist.total = intTotal;
+                    _pglist.everyPageSize = everyPageSize;
+                    _pglist.pages = pages;
+                    var _dy = dset.Tables[0].TableToDynamicList();
+                    _pglist.list = _dy;
+                }
             }
-        }
-        catch (Exception ex)
-        {
-            LogHelper.Debug(ToString(), ex.Message);
+            catch (Exception ex)
+            {
+                LogHelper.Debug(ToString(), ex.Message);
+            }
+            return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+                ReturnCode.Success, "璇诲彇鎴愬姛");
         }
 
-        return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
-            ReturnCode.Success, "璇诲彇鎴愬姛");
-    }
 
-
-    /// <summary>
-    ///     璇诲彇
-    /// </summary>
-    /// <param name="guid"></param>
-    /// <returns></returns>
-    [RequestMethod(RequestMethods.POST)]
-    public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
-    {
-        string guid = model.guid.ToString();
-        dynamic m = new ExpandoObject();
-        m.list = new List<dynamic>();
-        m.list2 = new List<dynamic>();
-        m.list3 = new List<dynamic>();
-        SqlParameter[] parameters =
+        /// <summary>
+        ///     璇诲彇
+        /// </summary>
+        /// <param name="guid"></param>
+        /// <returns></returns>
+        [RequestMethod(RequestMethods.POST)]
+        public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
         {
+            string guid = model.guid.ToString();
+            dynamic m = new ExpandoObject();
+            m.list = new List<dynamic>();
+            m.list2 = new List<dynamic>();
+            m.list3 = new List<dynamic>();
+            SqlParameter[] parameters =
+            {
             new("@inMainGuid", guid),
             new("@inP1", ""),
             new("@inP2", ""),
             new("@inP3", ""),
-            new("@inP4", "")
-        };
-        var dset = new DataSet();
-        try
-        {
-            dset = DbHelperSQL.RunProcedure("[prc_fgd_mx]", parameters, "0");
-            if (dset != null && dset.Tables.Count > 0 &&
-                dset.Tables[0].Rows.Count > 0)
+            new("@inP4", "")};
+            var dset = new DataSet();
+            try
             {
-                var dr = dset.Tables[0].Rows[0];
-                m = dr.RowToDynamic();
-                var _tb = dset.Tables[1].TableToDynamicList();
-                m.list = _tb;
-                var _tb2 = dset.Tables[2].TableToDynamicList();
-                m.list2 = _tb2;
-                var _tb3 = dset.Tables[3].TableToDynamicList();
-                m.list3 = _tb3;
-            }
-        }
-        catch (Exception ex)
-        {
-            LogHelper.Debug(ToString(), ex.Message);
-        }
-
-        if (m != null)
-            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
-                "璇诲彇鎴愬姛锛�");
-        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
-    }
-
-
-    /// <summary>
-    ///     鐢熸垚鏂扮殑杩芥函鐮�
-    /// </summary>
-    /// <param name="model"></param>
-    /// <returns></returns>
-    [RequestMethod(RequestMethods.POST)]
-    public ReturnDto<int?> CreateTrace([FromBody] dynamic model)
-    {
-        int? rtnInt = (int)ReturnCode.Default;
-        Guid? guid = model.guid;
-        var _outMsg = "";
-        var _outSum = -1;
-        using (var conn = new SqlConnection(DbHelperSQL.strConn))
-        {
-            using (var cmd = new SqlCommand("[prc_fgd_trace_code]", conn))
-            {
-                try
+                dset = DbHelperSQL.RunProcedure("[prc_fgd_mx]", parameters, "0");
+                if (dset != null && dset.Tables.Count > 0 &&
+                    dset.Tables[0].Rows.Count > 0)
                 {
-                    conn.Open();
-                    cmd.CommandType = CommandType.StoredProcedure;
-                    SqlParameter[] parameters =
+                    var dr = dset.Tables[0].Rows[0];
+                    m = dr.RowToDynamic();
+                    var _tb = dset.Tables[1].TableToDynamicList();
+                    m.list = _tb;
+                    var _tb2 = dset.Tables[2].TableToDynamicList();
+                    m.list2 = _tb2;
+                    var _tb3 = dset.Tables[3].TableToDynamicList();
+                    m.list3 = _tb3;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Debug(ToString(), ex.Message);
+            }
+            if (m != null)
+                return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+            return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�");
+        }
+
+
+        /// <summary>
+        /// 鐢熸垚鏂扮殑杩芥函鐮�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [RequestMethod(RequestMethods.POST)]
+        public ReturnDto<int?> CreateTrace([FromBody] dynamic model)
+        {
+            int? rtnInt = (int)ReturnCode.Default;
+            Guid? guid = model.guid;
+            var _outMsg = "";
+            var _outSum = -1;
+            using (var conn = new SqlConnection(DbHelperSQL.strConn))
+            {
+                using (var cmd = new SqlCommand("[prc_fgd_trace_code]", conn))
+                {
+                    try
                     {
+                        conn.Open();
+                        cmd.CommandType = CommandType.StoredProcedure;
+                        SqlParameter[] parameters =
+                        {
                         new("@outMsg", SqlDbType.NVarChar, 300),
                         new("@outSum", SqlDbType.Int),
-                        new("@inOrderGuid",
-                            UtilityHelper.CheckGuid(guid)
-                                ? guid
-                                : DBNull.Value),
-                        new("@inEdtUserGuid", _userGuid)
+                        new("@inOrderGuid", UtilityHelper.CheckGuid(guid)? guid : DBNull.Value),
+                        new("@inEdtUserGuid", _userGuid),
                     };
-                    parameters[0].Direction = ParameterDirection.Output;
-                    parameters[1].Direction = ParameterDirection.Output;
-                    foreach (var parameter in parameters)
-                        cmd.Parameters.Add(parameter);
-                    cmd.ExecuteNonQuery();
-                    _outMsg = parameters[0].Value.ToString();
-                    _outSum = int.Parse(parameters[1].Value.ToString());
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.Debug(ToString(),
-                        "prc_fgd_trace_code error锛�" + ex.Message);
-                    _outMsg = ex.Message;
-                    _outSum = -1;
-                }
-                finally
-                {
-                    conn.Close();
+                        parameters[0].Direction = ParameterDirection.Output;
+                        parameters[1].Direction = ParameterDirection.Output;
+                        foreach (var parameter in parameters)
+                            cmd.Parameters.Add(parameter);
+                        cmd.ExecuteNonQuery();
+                        _outMsg = parameters[0].Value.ToString();
+                        _outSum = int.Parse(parameters[1].Value.ToString());
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.Debug(ToString(),
+                            "prc_fgd_trace_code error锛�" + ex.Message);
+                        _outMsg = ex.Message;
+                        _outSum = -1;
+                    }
+                    finally
+                    {
+                        conn.Close();
+                    }
                 }
             }
+            if (_outSum <= 0)
+                return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,_outMsg);
+            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
         }
 
-        if (_outSum <= 0)
-            return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
-                _outMsg);
-        return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, _outMsg);
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3