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/MesQaItemsDetect01Manager.cs | 160 ++++++++++++++++++++++++++++++----------------------
1 files changed, 92 insertions(+), 68 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesQaItemsDetect01Manager.cs b/WebApi/GS.QC/Service/MesQaItemsDetect01Manager.cs
index 6239f75..4e9cdbc 100644
--- a/WebApi/GS.QC/Service/MesQaItemsDetect01Manager.cs
+++ b/WebApi/GS.QC/Service/MesQaItemsDetect01Manager.cs
@@ -1,5 +1,6 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using System.Dynamic;
using System.Text;
using Gs.Entity.QC;
using Gs.Toolbox;
@@ -8,21 +9,23 @@
using Gs.Toolbox.ApiCore.Group;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System.Dynamic;
using static Gs.Toolbox.UtilityHelper;
+
namespace GS.QC.Service;
[ApiGroup(ApiGroupNames.QC)]
-public class MesQaItemsDetect01Manager : Repository<MesQaItemsDetect01>,IRomteService
+public class MesQaItemsDetect01Manager : Repository<MesQaItemsDetect01>,
+ IRomteService
{
private readonly IHttpContextAccessor _http;
private readonly string _userCode, _userGuid, _orgFids;
+
public MesQaItemsDetect01Manager(IHttpContextAccessor httpContextAccessor)
{
_http = httpContextAccessor;
(_userCode, _userGuid, _orgFids) =
- UtilityHelper.GetUserGuidAndOrgGuid(_http);
+ GetUserGuidAndOrgGuid(_http);
}
#region CRUD
@@ -110,7 +113,8 @@
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[iqc_detect01_get]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[iqc_detect01_get]", parameters,
+ "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
@@ -145,14 +149,17 @@
dynamic m = new ExpandoObject();
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
- System.Text.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");
+ 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
{
- DataSet dset = new DataSet();
+ var dset = new DataSet();
dset = DbHelperSQL.Query(sb.ToString());
var _tb = dset.Tables[0].TableToDynamicList();
m.list = _tb;
@@ -162,8 +169,9 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(),
- "GetModel12 error锛�" + ex.Message);
+ "GetModel12 error锛�" + ex.Message);
}
+
if (m != null)
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
@@ -182,7 +190,7 @@
[FromBody] MesQaItemsDetect01 model)
{
int? rtnInt = (int)ReturnCode.Default;
- string _sbMsg = "";
+ var _sbMsg = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("iqc_detect01_reload", conn))
@@ -207,14 +215,14 @@
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
- _sbMsg = (parameters[0].Value.ToString());
+ _sbMsg = parameters[0].Value.ToString();
rtnInt = int.Parse(parameters[1].Value.ToString());
}
catch (Exception ex)
{
LogHelper.Debug(ToString(),
"chk_iqc_detect01_reload error锛�" + ex.Message);
- _sbMsg = ("瀛樺偍杩囩▼鎵ц澶辫触锛�" + ex.Message);
+ _sbMsg = "瀛樺偍杩囩▼鎵ц澶辫触锛�" + ex.Message;
}
finally
{
@@ -222,17 +230,17 @@
}
}
}
+
if (rtnInt > 0)
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success,
_sbMsg);
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- _sbMsg);
-
+ _sbMsg);
}
/// <summary>
- /// 褰曞叆妫�楠岀粨鏋�
+ /// 褰曞叆妫�楠岀粨鏋�
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -259,7 +267,7 @@
new("@inEdtUserGuid", _userGuid),
new("@inOrderGuid1", inOrderGuid1),
new("@inOrderGuid5", inOrderGuid5),
- new("@inP1", inP1),
+ new("@inP1", inP1)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -282,6 +290,7 @@
}
}
}
+
if (_outSum <= 0)
return ReturnDto<string>.QuickReturn(_outSum,
ReturnCode.Exception, _outMsg);
@@ -300,7 +309,7 @@
{
Guid? guid = model.guid; //鍒拌揣鍗曚富閿�
string fngDesc = model.fngDesc; //澶囨敞
- string fhandle = model.fhandle; //澶囨敞
+ string ckId = model.ckId;
var _outMsg = "";
var _outSum = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -316,9 +325,10 @@
new("@outMsg", SqlDbType.NVarChar, 300),
new("@outSum", SqlDbType.Int),
new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", UtilityHelper.CheckGuid(guid) ? guid: DBNull.Value),
+ new("@inOrderGuid",
+ CheckGuid(guid) ? guid : DBNull.Value),
new("@fngDesc", fngDesc),
- new("@fhandle", fhandle),
+ new("@ckId", ckId)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -353,8 +363,9 @@
#region 鎻愪氦妫�楠�
+
/// <summary>
- /// 鎻愪氦妫�楠�
+ /// 鎻愪氦妫�楠�
/// </summary>
/// <param name="mode"></param>
/// <returns></returns>
@@ -375,14 +386,14 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", _guid),
- new("@inFieldValue", 1),
- new("@in1", ""),
- new("@in2", "")
- };
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inOrderGuid", _guid),
+ new("@inFieldValue", 1),
+ new("@in1", ""),
+ new("@in2", "")
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
@@ -394,8 +405,10 @@
catch (Exception ex)
{
m.outMsg = ex.Message;
- LogHelper.Debug(this.ToString(), "chk_iqc_detect01_submit error锛�" + ex.Message);
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
+ LogHelper.Debug(ToString(),
+ "chk_iqc_detect01_submit error锛�" + ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ ex.Message);
}
finally
{
@@ -403,17 +416,19 @@
}
}
}
+
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
/// <summary>
- /// 璐ㄩ噺锛屽鏍革紝鍙嶅鏍革紝椹冲洖
+ /// 璐ㄩ噺锛屽鏍革紝鍙嶅鏍革紝椹冲洖
/// </summary>
/// <param name="mode"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- public ReturnDto<ExpandoObject> EditModelSubmitZhiLiang([FromBody] dynamic mode)
+ public ReturnDto<ExpandoObject> EditModelSubmitZhiLiang(
+ [FromBody] dynamic mode)
{
string _guid = mode.guid;
string _inFieldValue = mode.inFieldValue;
@@ -430,14 +445,14 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 300),
- new("@outSum", SqlDbType.Int),
- new("@inEdtUserGuid", _userGuid),
- new("@inOrderGuid", _guid),
- new("@inFieldValue",_inFieldValue),
- new("@in1", ""),
- new("@in2", "")
- };
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.Int),
+ new("@inEdtUserGuid", _userGuid),
+ new("@inOrderGuid", _guid),
+ new("@inFieldValue", _inFieldValue),
+ new("@in1", ""),
+ new("@in2", "")
+ };
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
@@ -449,8 +464,10 @@
catch (Exception ex)
{
m.outMsg = ex.Message;
- LogHelper.Debug(this.ToString(), "iqc_detect01_zhiliang error锛�" + ex.Message);
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, ex.Message);
+ LogHelper.Debug(ToString(),
+ "iqc_detect01_zhiliang error锛�" + ex.Message);
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ ex.Message);
}
finally
{
@@ -458,6 +475,7 @@
}
}
}
+
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
@@ -474,49 +492,52 @@
public ReturnDto<List<dynamic>> GetYangLi([FromBody] dynamic model)
{
string guid = model.dt01Guid.ToString();
- List<dynamic> lst = new List<dynamic>();
+ var lst = new List<dynamic>();
SqlParameter[] parameters =
{
- new("@dt01Guid", guid),
+ new("@dt01Guid", guid)
};
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[iqc_detect01_13Lst]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[iqc_detect01_13Lst]", parameters,
+ "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
- DataTable _tb = dset.Tables[1];
- int maxYl = int.Parse(dset.Tables[0].Rows[0][0].ToString());
+ var _tb = dset.Tables[1];
+ var maxYl = int.Parse(dset.Tables[0].Rows[0][0].ToString());
//鍦ㄦ楠岄」鐩〃涓婏紝鏍规嵁鏍锋湰鏁拌嚜鍔ㄥ欢鐢虫牱鏈�1锛屾牱鏈�2锛屾牱鏈�3鈥︹��
- for (int i = 1; i <= maxYl; i++)
+ for (var i = 1; i <= maxYl; i++)
{
- _tb.Columns.Add("鏍锋湰" + i.ToString(), typeof(decimal));
- _tb.Columns.Add("鏍锋湰" + i.ToString() + "jg", typeof(string));
- };
- DataTable _tb2 = dset.Tables[2];
+ _tb.Columns.Add("鏍锋湰" + i, typeof(decimal));
+ _tb.Columns.Add("鏍锋湰" + i + "jg", typeof(string));
+ }
+
+ ;
+ var _tb2 = dset.Tables[2];
//寰幆鏍锋湰缁撴灉琛ㄧ殑姣忎竴琛�
foreach (DataRow row in _tb.Rows)
- {
//鐒跺悗寰幆妫�楠岄」鐩湰鐨勭涓�鍒�
- foreach (DataColumn col in _tb.Columns)
+ foreach (DataColumn col in _tb.Columns)
+ if (col.ColumnName.StartsWith("鏍锋湰"))
{
- if (col.ColumnName.ToString().StartsWith("鏍锋湰"))
+ var _idx = col.ColumnName.Replace("鏍锋湰", "");
+ //鎺掗櫎鏍锋湰鏁拌繖涓�鍒�
+ if (!string.IsNullOrEmpty(_idx) && _idx != "鏁�")
{
- string _idx = col.ColumnName.ToString().Replace("鏍锋湰", "");
- //鎺掗櫎鏍锋湰鏁拌繖涓�鍒�
- if (!string.IsNullOrEmpty(_idx) && _idx != "鏁�")
+ var _row = _tb2.Select(" parent_guid='" +
+ row["guid"] +
+ "' and fcheck_item='" +
+ col.ColumnName.Trim() + "'");
+ if (_row.Length > 0)
{
- DataRow[] _row = _tb2.Select(" parent_guid='" + row["guid"].ToString() + "' and fcheck_item='" + col.ColumnName.ToString().Trim() + "'");
- if (_row.Length > 0)
- {
- row[col.ColumnName] = _row[0]["fcheck_resu"];
- row[col.ColumnName + "jg"] = _row[0]["fstand"];
- }
+ row[col.ColumnName] = _row[0]["fcheck_resu"];
+ row[col.ColumnName + "jg"] = _row[0]["fstand"];
}
}
}
- }
+
lst = _tb.TableToDynamicList();
}
}
@@ -524,6 +545,7 @@
{
LogHelper.Debug(ToString(), ex.Message);
}
+
return ReturnDto<List<dynamic>>.QuickReturn(lst, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
}
@@ -558,11 +580,11 @@
new("@outSum", SqlDbType.Int),
new("@outGuid", SqlDbType.UniqueIdentifier),
new("@outNo", SqlDbType.NVarChar, 300),
- new("@outFstand",SqlDbType.NVarChar, 10),
+ new("@outFstand", SqlDbType.NVarChar, 10),
new("@dt05Guid", CheckGuid(guid) ? guid : DBNull.Value),
new("@fVal", fVal),
new("@fSeq", fSeq),
- new("@inEdtUserGuid", _userGuid),
+ new("@inEdtUserGuid", _userGuid)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -591,9 +613,11 @@
}
}
}
+
//if (mObj.outSum <= 0)
// return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Exception, mObj.outMsg);
- return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success, mObj.outMsg);
+ return ReturnDto<dynamic>.QuickReturn(mObj, ReturnCode.Success,
+ mObj.outMsg);
}
#endregion
--
Gitblit v1.9.3