From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期二, 09 九月 2025 18:46:28 +0800 Subject: [PATCH] 代码清理 --- WebApi/Gs.Wom/WorkService/WorkRepairController.cs | 257 ++++++++++++++++++++++++++------------------------- 1 files changed, 130 insertions(+), 127 deletions(-) diff --git a/WebApi/Gs.Wom/WorkService/WorkRepairController.cs b/WebApi/Gs.Wom/WorkService/WorkRepairController.cs index 0bd7643..d373d63 100644 --- a/WebApi/Gs.Wom/WorkService/WorkRepairController.cs +++ b/WebApi/Gs.Wom/WorkService/WorkRepairController.cs @@ -10,36 +10,35 @@ using static Gs.Toolbox.UtilityHelper; -namespace Gs.Wom.WorkService +namespace Gs.Wom.WorkService; + +[ApiGroup(ApiGroupNames.WOM)] +public class WorkRepairController : IRomteService { + private readonly IHttpContextAccessor _http; + private readonly string _userCode, _userGuid, _orgFids; - [ApiGroup(ApiGroupNames.WOM)] - public class WorkRepairController : IRomteService + public WorkRepairController(IHttpContextAccessor httpContextAccessor) { - private readonly IHttpContextAccessor _http; - private readonly string _userCode, _userGuid, _orgFids; + _http = httpContextAccessor; + (_userCode, _userGuid, _orgFids) = + GetUserGuidAndOrgGuid(_http); + } - public WorkRepairController(IHttpContextAccessor httpContextAccessor) + /// <summary> + /// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤� + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [RequestMethod(RequestMethods.POST)] + public ReturnDto<PageList<dynamic>> GetListPage([FromBody] PageQuery model) + { + var currentPage = model.currentPage; + var everyPageSize = model.everyPageSize; + var sortName = model.sortName; + var keyWhere = model.keyWhere; + SqlParameter[] parameters = { - _http = httpContextAccessor; - (_userCode, _userGuid, _orgFids) = - GetUserGuidAndOrgGuid(_http); - } - - /// <summary> - /// 璇诲彇鍒楄〃锛屾敮鎸佸垎椤� - /// </summary> - /// <param name="model"></param> - /// <returns></returns> - [RequestMethod(RequestMethods.POST)] - public ReturnDto<PageList<dynamic>> GetListPage([FromBody] PageQuery 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), @@ -51,123 +50,127 @@ new("@inP3", ""), new("@inP4", "") }; - var dset = new DataSet(); - var _pglist = new PageList<dynamic> + var dset = new DataSet(); + var _pglist = new PageList<dynamic> + { + total = 0, + everyPageSize = 0, + pages = 0, + list = new List<dynamic>() + }; + try + { + dset = DbHelperSQL.RunProcedure("work_repair_lst", parameters, "0"); + if (dset != null && dset.Tables.Count > 0 && + dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹� { - total = 0, - everyPageSize = 0, - pages = 0, - list = new List<dynamic>() - }; - try - { - dset = DbHelperSQL.RunProcedure("work_repair_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; - } + 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); - return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, - ReturnCode.Exception, ex.Message); - } - + } + catch (Exception ex) + { + LogHelper.Debug(ToString(), ex.Message); return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, - ReturnCode.Success, "璇诲彇鎴愬姛"); + ReturnCode.Exception, ex.Message); } + 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) + + /// <summary> + /// 璇诲彇 + /// </summary> + /// <param name="guid"></param> + /// <returns></returns> + [RequestMethod(RequestMethods.POST)] + public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model) + { + string guid = model.guid.ToString(); + string barCode = model.barCode.ToString(); + string badXx = model.badXx; //涓嶈壇鐜板儚 + string badYy = model.badYy; //涓嶈壇鍘熷洜 + string badDc = model.badDc; //涓嶈壇瀵圭瓥 + string checkResult = model.checkResult; //妫�娴嬬粨鏋� + dynamic m = new ExpandoObject(); + m.list = new List<dynamic>(); + m.list2 = new List<dynamic>(); + m.list3 = new List<dynamic>(); + m.outMsg = ""; + m.outSum = -1; + var _strMsg = ""; + var _sum = 0; + SqlParameter[] parameters = { - string guid = model.guid.ToString(); - string barCode = model.barCode.ToString(); - string badXx = model.badXx; //涓嶈壇鐜板儚 - string badYy = model.badYy; //涓嶈壇鍘熷洜 - string badDc = model.badDc; //涓嶈壇瀵圭瓥 - string checkResult = model.checkResult; //妫�娴嬬粨鏋� - dynamic m = new ExpandoObject(); - m.list = new List<dynamic>(); - m.list2 = new List<dynamic>(); - m.list3 = new List<dynamic>(); - m.outMsg = ""; - m.outSum = -1; - string _strMsg = ""; - int _sum = 0; - SqlParameter[] parameters = + new("@inP1", badXx), + new("@inP2", badYy), + new("@inP3", checkResult), + new("@inP4", barCode), //杩欐槸杩芥函鐮� barCode, + new("@inP5", badDc), + new("@inEdtUserGuid", _userGuid), + new("@inMainGuid", guid) + }; + var dset = new DataSet(); + try + { + dset = DbHelperSQL.RunProcedure("[work_repair_mx]", + parameters, "0"); + if (dset != null && dset.Tables.Count > 0 && + dset.Tables[0].Rows.Count > 0) { - new("@inP1", badXx), - new("@inP2", badYy), - new("@inP3",checkResult), - new("@inP4", barCode),//杩欐槸杩芥函鐮� barCode, - new("@inP5",badDc), - new("@inEdtUserGuid", _userGuid), - new("@inMainGuid", guid), - }; - var dset = new DataSet(); - try - { - dset = DbHelperSQL.RunProcedure("[work_repair_mx]", - parameters, "0"); - if (dset != null && dset.Tables.Count > 0 && - dset.Tables[0].Rows.Count > 0) + //0杩斿洖娑堟伅鍜岃繑鍥炲�� + _strMsg = dset.Tables[0].Rows[0]["outMsg"].ToString(); + _sum = int.Parse(dset.Tables[0].Rows[0]["outSum"].ToString()); + //1缁熻鍜屽ご琛� + if (dset.Tables.Count > 1 && dset.Tables[1].Rows.Count > 0) { - //0杩斿洖娑堟伅鍜岃繑鍥炲�� - _strMsg = dset.Tables[0].Rows[0]["outMsg"].ToString(); - _sum = int.Parse(dset.Tables[0].Rows[0]["outSum"].ToString()); - //1缁熻鍜屽ご琛� - if (dset.Tables.Count > 1 && dset.Tables[1].Rows.Count > 0) - { - var dr = dset.Tables[1].Rows[0]; - m = dr.RowToDynamic(); - } - m.outMsg = _strMsg; - m.outSum = _sum; - //2鑹搧鍒楄〃 - if (dset.Tables.Count > 2) - { - var _tb = dset.Tables[2].TableToDynamicList(); - m.list = _tb; - } - //3涓嶈壇鍝佸垪琛� - if (dset.Tables.Count > 3) - { - var _tb2 = dset.Tables[3].TableToDynamicList(); - m.list2 = _tb2; - } + var dr = dset.Tables[1].Rows[0]; + m = dr.RowToDynamic(); } - else + + m.outMsg = _strMsg; + m.outSum = _sum; + //2鑹搧鍒楄〃 + if (dset.Tables.Count > 2) { - m.outMsg = "娌℃湁鎵惧埌璇ユ潯鐮侊紒"; - m.outSum = -1; + var _tb = dset.Tables[2].TableToDynamicList(); + m.list = _tb; + } + + //3涓嶈壇鍝佸垪琛� + if (dset.Tables.Count > 3) + { + var _tb2 = dset.Tables[3].TableToDynamicList(); + m.list2 = _tb2; } } - catch (Exception ex) + else { - LogHelper.Debug(this.ToString(), ex.Message); - m.outMsg = ex.Message; + m.outMsg = "娌℃湁鎵惧埌璇ユ潯鐮侊紒"; m.outSum = -1; } - if (m.outSum > 0) - return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, m.outMsg); - return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, m.outMsg); } + catch (Exception ex) + { + LogHelper.Debug(ToString(), ex.Message); + m.outMsg = ex.Message; + m.outSum = -1; + } + + if (m.outSum > 0) + return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, + m.outMsg); + return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, + m.outMsg); } -} +} \ No newline at end of file -- Gitblit v1.9.3