From aebd2d642e19ce9ccb253c671b239e7ed9fc91c6 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 16:11:12 +0800
Subject: [PATCH] 代码修改为七喜
---
WebApi/Gs.Wom/WorkService/WorkRepairController.cs | 257 +++++++++++++++++++++++++--------------------------
1 files changed, 127 insertions(+), 130 deletions(-)
diff --git a/WebApi/Gs.Wom/WorkService/WorkRepairController.cs b/WebApi/Gs.Wom/WorkService/WorkRepairController.cs
index d373d63..0bd7643 100644
--- a/WebApi/Gs.Wom/WorkService/WorkRepairController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkRepairController.cs
@@ -10,35 +10,36 @@
using static Gs.Toolbox.UtilityHelper;
-namespace Gs.Wom.WorkService;
-
-[ApiGroup(ApiGroupNames.WOM)]
-public class WorkRepairController : IRomteService
+namespace Gs.Wom.WorkService
{
- private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
- public WorkRepairController(IHttpContextAccessor httpContextAccessor)
+ [ApiGroup(ApiGroupNames.WOM)]
+ public class WorkRepairController : IRomteService
{
- _http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) =
- GetUserGuidAndOrgGuid(_http);
- }
+ private readonly IHttpContextAccessor _http;
+ private readonly string _userCode, _userGuid, _orgFids;
- /// <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 =
+ public WorkRepairController(IHttpContextAccessor httpContextAccessor)
{
+ _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),
@@ -50,127 +51,123 @@
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("work_repair_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("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;
+ }
}
- }
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), ex.Message);
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Exception, ex.Message);
+ }
+
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Exception, ex.Message);
+ 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();
- 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 =
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
{
- 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)
+ 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 =
{
- //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)
+ 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)
{
- var dr = dset.Tables[1].Rows[0];
- m = dr.RowToDynamic();
+ //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;
+ }
}
-
- m.outMsg = _strMsg;
- m.outSum = _sum;
- //2鑹搧鍒楄〃
- if (dset.Tables.Count > 2)
+ else
{
- var _tb = dset.Tables[2].TableToDynamicList();
- m.list = _tb;
- }
-
- //3涓嶈壇鍝佸垪琛�
- if (dset.Tables.Count > 3)
- {
- var _tb2 = dset.Tables[3].TableToDynamicList();
- m.list2 = _tb2;
+ m.outMsg = "娌℃湁鎵惧埌璇ユ潯鐮侊紒";
+ m.outSum = -1;
}
}
- else
+ catch (Exception ex)
{
- m.outMsg = "娌℃湁鎵惧埌璇ユ潯鐮侊紒";
+ LogHelper.Debug(this.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);
}
- 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