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/MesDefectCodeManager.cs | 153 ++++++++++++++++++++++++++++-----------------------
1 files changed, 84 insertions(+), 69 deletions(-)
diff --git a/WebApi/GS.QC/Service/MesDefectCodeManager.cs b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
index d305cfa..4572035 100644
--- a/WebApi/GS.QC/Service/MesDefectCodeManager.cs
+++ b/WebApi/GS.QC/Service/MesDefectCodeManager.cs
@@ -1,4 +1,6 @@
-锘縰sing System.Text;
+锘縰sing System.Data;
+using System.Dynamic;
+using System.Text;
using GS.QC.Models;
using Gs.Toolbox;
using Gs.Toolbox.ApiCore.Abstract.Mvc;
@@ -7,10 +9,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-using System.Data;
-using System.Dynamic;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
namespace GS.QC.Service;
@@ -35,49 +33,33 @@
/// <param name="query"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- /// <summary>
- /// 鍒嗛〉鏌ヨ缂洪櫡浠ｇ爜鍒楄〃鏁版嵁
- /// </summary>
- /// <param name="query">鍒嗛〉鏌ヨ鍙傛暟瀵硅薄锛堝寘鍚〉鐮併�佹瘡椤垫潯鏁般�佹帓搴忋�佹煡璇㈡潯浠剁瓑锛�</param>
- /// <returns>鍖呭惈鍒嗛〉鏁版嵁鐨勮繑鍥炵粨鏋滐紙鏁版嵁鍒楄〃銆佹�绘潯鏁扮瓑锛�</returns>
public ReturnDto<PageList<MesDefectCode>> GetListPage(PageQuery query)
{
- // 鍒濆鍖栧垎椤电粨鏋滃璞★紙榛樿绌哄垪琛紝鍚庣画浼氬～鍏呮暟鎹級
var pageList = new PageList<MesDefectCode>();
try
{
- // 1. 鏋勫缓鏌ヨ鏉′欢锛圵HERE瀛愬彞锛�
- // "1=1" 鏄竾鑳芥潯浠讹紙閬垮厤鍚庣画鎷兼帴鏉′欢鏃堕渶瑕佸垽鏂槸鍚﹀姞AND锛夛紝鎷兼帴鏌ヨ鍙傛暟涓殑鑷畾涔夋潯浠讹紙query.keyWhere锛�
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
-
- // 2. 鏋勫缓鎺掑簭鏉′欢锛圤RDER BY瀛愬彞锛�
- // 鎷兼帴鎺掑簭瀛楁锛坬uery.sortName锛夊拰鎺掑簭鏂瑰悜锛坬uery.sortOrder锛屽"ASC"鍗囧簭銆�"DESC"闄嶅簭锛�
- var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
-
- // 3. 澹版槑鎬昏褰曟暟鍙橀噺锛堢敤浜庢帴鏀舵煡璇㈢粨鏋滅殑鎬绘潯鏁帮級
+ var _sbBy =
+ new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
-
- // 4. 鎵ц鍒嗛〉鏌ヨ
- // 浣跨敤鏁版嵁搴撹闂伐鍏凤紙Db.Queryable锛夋煡璇esDefectCode琛紙鍒悕"a"锛�
var itemsList = Db.Queryable<MesDefectCode>("a")
- .Where(_sbWhere.ToString()) // 搴旂敤WHERE鏉′欢
- .OrderBy(_sbBy.ToString()) // 搴旂敤鎺掑簭鏉′欢
- // 鍒嗛〉鏌ヨ锛氬綋鍓嶉〉鐮侊紙query.currentPage锛夈�佹瘡椤垫潯鏁帮紙query.everyPageSize锛夛紝鎬绘潯鏁伴�氳繃ref鍙傛暟杩斿洖
- .ToPageList(query.currentPage, query.everyPageSize, ref totalCount);
+ .Where(_sbWhere.ToString())
+ .OrderBy(_sbBy.ToString())
+ .ToPageList(query.currentPage, query.everyPageSize,
+ ref totalCount);
- // 5. 缁勮鍒嗛〉缁撴灉瀵硅薄
- // 鍖呭惈褰撳墠椤垫暟鎹紙itemsList锛夈�佹�绘潯鏁帮紙totalCount锛夈�佹瘡椤垫潯鏁帮紙query.everyPageSize锛�
- pageList = new PageList<MesDefectCode>(itemsList, totalCount, query.everyPageSize);
-
- // 6. 杩斿洖鎴愬姛缁撴灉锛氬寘鍚垎椤垫暟鎹�佹垚鍔熺姸鎬佺爜銆佹彁绀轰俊鎭�
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Success, "璇诲彇鎴愬姛");
+ pageList = new PageList<MesDefectCode>(itemsList, totalCount,
+ query.everyPageSize);
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
}
catch (Exception ex)
{
- // 鎹曡幏寮傚父鏃讹紝杩斿洖绌哄垎椤电粨鏋溿�侀粯璁ら敊璇爜銆佸紓甯镐俊鎭�
- return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList, ReturnCode.Default, ex.Message);
+ return ReturnDto<PageList<MesDefectCode>>.QuickReturn(pageList,
+ ReturnCode.Default, ex.Message);
}
}
+
/// <summary>
/// 璇诲彇
/// </summary>
@@ -87,10 +69,11 @@
public ReturnDto<MesDefectCode> GetModel([FromBody] MesDefectCode model)
{
var m = base.GetById(model.Guid);
- System.Text.StringBuilder sb = new StringBuilder();
- sb.Append(" select max(defect_code)+1 from [dbo].[MES_DEFECT_CODE] w ");
+ var sb = new StringBuilder();
+ sb.Append(
+ " select max(defect_code)+1 from [dbo].[MES_DEFECT_CODE] w ");
sb.Append(" where pid='" + m.Guid + "'");
- string maxNo = "";
+ var maxNo = "";
try
{
var obj = DbHelperSQL.GetSingle(sb.ToString());
@@ -103,6 +86,7 @@
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
}
+
m.MaxNo = maxNo;
if (m != null)
return ReturnDto<MesDefectCode>.QuickReturn(m, ReturnCode.Success,
@@ -144,10 +128,12 @@
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
Db.Ado.RollbackTran();
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
+ ex.Message);
}
- return ReturnDto<string>.QuickReturn(model.Guid.ToString(), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<string>.QuickReturn(model.Guid.ToString(),
+ ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
/// <summary>
@@ -159,42 +145,44 @@
public ReturnDto<int?> DeleteModel([FromBody] JArray guidList)
{
var intArray = guidList.ToObject<string[]>();
- string guid = intArray[0];
- int it = 0;
+ var guid = intArray[0];
+ var it = 0;
int? rtnInt = 0;
//鏍归」涓嶈兘鍒犻櫎
- string pid = "";
+ var pid = "";
try
{
- pid = DbHelperSQL.GetSingle("select top 1 pid from MES_DEFECT_CODE where guid='" + guid + "' ").ToString();
+ pid = DbHelperSQL
+ .GetSingle(
+ "select top 1 pid from MES_DEFECT_CODE where guid='" +
+ guid + "' ").ToString();
}
catch (Exception ex)
{
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "鍒犻櫎澶辫触:" + ex.Message);
+ "鍒犻櫎澶辫触:" + ex.Message);
}
+
if (pid == "00000000-0000-0000-0000-000000000000")
- {
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "璇ラ」鐩负鏍圭洰褰曪紝涓嶈兘鍒犻櫎锛�");
- }
+ "璇ラ」鐩负鏍圭洰褰曪紝涓嶈兘鍒犻櫎锛�");
//鏈夊瓙椤逛笉鑳藉垹闄�
- System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append(" select count(1) from [MES_DEFECT_CODE] where pid='" + guid + "' ");
+ var sbSql = new StringBuilder();
+ sbSql.Append(" select count(1) from [MES_DEFECT_CODE] where pid='" +
+ guid + "' ");
try
{
- it = int.Parse(Gs.Toolbox.DbHelperSQL.GetSingle(sbSql.ToString()).ToString());
+ it = int.Parse(DbHelperSQL.GetSingle(sbSql.ToString()).ToString());
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), "DeleteModel error锛�" + ex.Message);
}
+
if (it > 0)
- {
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception,
- "鍒犻櫎澶辫触锛岃椤圭洰瀛樺湪瀛愰」锛�");
- }
+ "鍒犻櫎澶辫触锛岃椤圭洰瀛樺湪瀛愰」锛�");
rtnInt = base.DeleteById(intArray) ? intArray.Length : 0;
if (rtnInt > 0)
return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success,
@@ -204,7 +192,6 @@
}
/// <summary>
- ///
/// </summary>
/// <param name="guidList"></param>
/// <returns></returns>
@@ -214,19 +201,21 @@
string strWhere = model.strWhere;
var lst = new List<dynamic>();
var dset = new DataSet();
- System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append("select [type_memo] from [dbo].[MES_DEFECT_TYPE] a where 1=1");
+ var sbSql = new StringBuilder();
+ sbSql.Append(
+ "select [type_memo] from [dbo].[MES_DEFECT_TYPE] a where 1=1");
if (!string.IsNullOrEmpty(strWhere))
sbSql.Append(strWhere);
sbSql.Append(" order by [type_memo] asc");
try
{
- dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
+ dset = DbHelperSQL.Query(sbSql.ToString());
}
catch (Exception ex)
{
- LogHelper.Debug(this.ToString(), "EditModel error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
}
+
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
lst = dset.Tables[0].TableToDynamicList();
@@ -248,18 +237,41 @@
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
var dset = new DataSet();
- System.Text.StringBuilder sbSql = new StringBuilder();
- sbSql.Append(" select * from [dbo].[MES_DEFECT_CODE] where guid='" + guid + "'");
- sbSql.Append(" select bind.guid,bind.fType ,u.ACCOUNT,u.USER_NAME,org.NAME as orgName,q.defect_name from [dbo].[SYS_USER_BIND] bind");
+ var sbSql = new StringBuilder();
+ sbSql.Append(" select * from [dbo].[MES_DEFECT_CODE] where guid='" +
+ guid + "'");
+ sbSql.Append(
+ " select bind.guid,bind.fType ,u.ACCOUNT,u.USER_NAME,org.NAME as orgName,q.defect_name from [dbo].[SYS_USER_BIND] bind");
sbSql.Append(" left join SYS_USER u on bind.aboutGuid=u.guid");
- sbSql.Append(" left join mes_staff f on u.STAFF_ID=f.id left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
- sbSql.Append(" left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
- sbSql.Append(" where 1=1 and bind.userGuid='" + guid + "' and bind.fType='鍛樺伐鍒嗗尯'");
- sbSql.Append(" select bind.guid,bind.fType ,f.item_id,f.item_no,f.item_name,org.NAME as orgName,q.defect_name");
- sbSql.Append(" from [dbo].[SYS_USER_BIND] bind left join MES_ITEMS f on bind.aboutGuid=f.guid");
- sbSql.Append(" left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
- sbSql.Append(" left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
- sbSql.Append(" where 1=1 and bind.userGuid='" + guid + "' and bind.fType='鐗╂枡鍒嗗尯'");
+ sbSql.Append(
+ " left join mes_staff f on u.STAFF_ID=f.id left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
+ sbSql.Append(
+ " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
+ "' and bind.fType='鍛樺伐鍒嗗尯'");
+ sbSql.Append(
+ " select bind.guid,bind.fType ,f.item_id,f.item_no,f.item_name,org.NAME as orgName,q.defect_name");
+ sbSql.Append(
+ " from [dbo].[SYS_USER_BIND] bind left join MES_ITEMS f on bind.aboutGuid=f.item_id");
+ sbSql.Append(
+ " left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid");
+ sbSql.Append(
+ " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
+ "' and bind.fType='鐗╂枡鍒嗗尯'");
+ sbSql.Append(
+ " select bind.guid,bind.fType ,u.depot_section_code,u.depot_section_name");
+ sbSql.Append(
+ " ,org.NAME as orgName ,q.defect_name from [dbo].[SYS_USER_BIND] bind ");
+ sbSql.Append(
+ " left join MES_DEPOT_SECTIONS u on bind.aboutGuid=u.depot_section_code ");
+ sbSql.Append(" left join MES_DEPOTS f on u.depot_guid=f.depot_id");
+ sbSql.Append(
+ " left join [dbo].[MES_DEFECT_CODE] q on bind.userGuid=q.guid ");
+ sbSql.Append(
+ " left join [dbo].[SYS_ORGANIZATION] org on org.FID=f.FSubsidiary ");
+ sbSql.Append(" where 1=1 and bind.userGuid='" + guid +
+ "' and bind.fType='搴撲綅'");
try
{
dset = DbHelperSQL.Query(sbSql.ToString());
@@ -272,12 +284,15 @@
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,
"璇诲彇鎴愬姛锛�");
--
Gitblit v1.9.3