From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/GS.QC/Service/IpqcXunManager.cs | 261 ++++++++++++++++++++++++++-------------------------
1 files changed, 133 insertions(+), 128 deletions(-)
diff --git a/WebApi/GS.QC/Service/IpqcXunManager.cs b/WebApi/GS.QC/Service/IpqcXunManager.cs
index 75cab9b..06b18da 100644
--- a/WebApi/GS.QC/Service/IpqcXunManager.cs
+++ b/WebApi/GS.QC/Service/IpqcXunManager.cs
@@ -9,36 +9,37 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using static Gs.Toolbox.UtilityHelper;
-namespace GS.QC.Service
+
+namespace GS.QC.Service;
+
+[ApiGroup(ApiGroupNames.QC)]
+public class IpqcXunManager : IRomteService
{
- [ApiGroup(ApiGroupNames.QC)]
- public class IpqcXunManager : IRomteService
+ private readonly IHttpContextAccessor _http;
+ private readonly string _userCode, _userGuid, _orgFids;
+
+ public IpqcXunManager(IHttpContextAccessor httpContextAccessor)
{
- private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
+ _http = httpContextAccessor;
+ (_userCode, _userGuid, _orgFids) =
+ GetUserGuidAndOrgGuid(_http);
+ }
- public IpqcXunManager(IHttpContextAccessor httpContextAccessor)
+
+ /// <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 =
{
- _http = httpContextAccessor;
- (_userCode, _userGuid, _orgFids) =
- 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),
@@ -50,122 +51,126 @@
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("[ipqc_xun_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("[ipqc_xun_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);
}
- /// <summary>
- /// 璇诲彇
- /// </summary>
- /// <param name="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModel([FromBody] dynamic model)
+ 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>();
+ SqlParameter[] parameters =
{
- string guid = model.guid.ToString();
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
- m.list2 = new List<dynamic>();
- SqlParameter[] parameters =
- {
new("@inMainGuid", guid),
new("@inP1", ""),
new("@inP2", ""),
new("@inP3", ""),
new("@inP4", "")
};
- var dset = new DataSet();
- try
- {
- dset = DbHelperSQL.RunProcedure("[ipqc_xun_get]", parameters, "0");
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 0)
- {
- var dr = dset.Tables[0].Rows[0];
- m = dr.RowToDynamic();
- var _tb = dset.Tables[1].TableToDynamicList();
- m.list5 = _tb;
- }
- }
- 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="guid"></param>
- /// <returns></returns>
- [RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
+ var dset = new DataSet();
+ try
{
- Guid guid = model.guid;
- string parentGuid = model.parentGuid;
- dynamic m = new ExpandoObject();
- m.list = new List<dynamic>();
- m.list2 = new List<dynamic>();
- StringBuilder sb = new StringBuilder();
- sb.Append("select * from MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" + guid + "' order by fstand asc");
- sb.Append(" select d13.*,d5.fcheck_item as fcheckItemd5,d5.ybsl from MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
- sb.Append(" where d13.parent_guid = '" + guid + "'");
- sb.Append(" order by d13.fcheck_item asc");
- try
+ dset = DbHelperSQL.RunProcedure("[ipqc_xun_get]", parameters, "0");
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0)
{
- DataSet dset = new DataSet();
- dset = DbHelperSQL.Query(sb.ToString());
- var _tb = dset.Tables[0].TableToDynamicList();
- m.list = _tb;
- var _tb2 = dset.Tables[1].TableToDynamicList();
- m.list2 = _tb2;
+ var dr = dset.Tables[0].Rows[0];
+ m = dr.RowToDynamic();
+ var _tb = dset.Tables[1].TableToDynamicList();
+ m.list5 = _tb;
}
- catch (Exception ex)
- {
- LogHelper.Debug(ToString(), "GetModel12 error锛�" + ex.Message);
- }
- if (m != null)
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
- "璇诲彇鎴愬姛锛�");
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
- "璇诲彇澶辫触锛�");
}
+ 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="guid"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<ExpandoObject> GetModel12([FromBody] dynamic model)
+ {
+ Guid guid = model.guid;
+ string parentGuid = model.parentGuid;
+ dynamic m = new ExpandoObject();
+ m.list = new List<dynamic>();
+ m.list2 = new List<dynamic>();
+ var sb = new StringBuilder();
+ sb.Append(
+ "select * from MES_QA_ITEMS_DETECT_DETAIL12 where parent_guid='" +
+ guid + "' order by fstand asc");
+ sb.Append(
+ " select d13.*,d5.fcheck_item as fcheckItemd5,d5.ybsl from MES_QA_ITEMS_DETECT_DETAIL13 d13 left join[dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d5 on d13.parent_guid = d5.guid");
+ sb.Append(" where d13.parent_guid = '" + guid + "'");
+ sb.Append(" order by d13.fcheck_item asc");
+ try
+ {
+ var dset = new DataSet();
+ dset = DbHelperSQL.Query(sb.ToString());
+ var _tb = dset.Tables[0].TableToDynamicList();
+ m.list = _tb;
+ var _tb2 = dset.Tables[1].TableToDynamicList();
+ m.list2 = _tb2;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "GetModel12 error锛�" + ex.Message);
+ }
+
+ if (m != null)
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛�");
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3