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/MesQmCheckitemManager.cs | 56 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 24 deletions(-) diff --git a/WebApi/GS.QC/Service/MesQmCheckitemManager.cs b/WebApi/GS.QC/Service/MesQmCheckitemManager.cs index a4b217a..3b07d10 100644 --- a/WebApi/GS.QC/Service/MesQmCheckitemManager.cs +++ b/WebApi/GS.QC/Service/MesQmCheckitemManager.cs @@ -1,4 +1,7 @@ -锘縰sing System.Text; +锘縰sing System.Data; +using System.Data.SqlClient; +using System.Dynamic; +using System.Text; using Gs.Entity.BaseInfo; using Gs.Entity.Sys; using GS.QC.Models; @@ -10,9 +13,6 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using SqlSugar; -using System.Data; -using System.Data.SqlClient; -using System.Dynamic; namespace GS.QC.Service; @@ -43,18 +43,19 @@ var _sbWhere = new StringBuilder(" 1=1 " + query.keyWhere); var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder); var totalCount = 0; - var itemsList = Db.Queryable<MesQmCheckitem, MesItems, SysOrganization>( - (a, b, org) => new object[] + var itemsList = Db + .Queryable<MesQmCheckitem, MesItems, SysOrganization>((a, b, org) => + new object[] { JoinType.Left, a.ItemId == b.Id, JoinType.Left, b.FSubsidiary == org.Fid }).Select((a, b, org) => new MesQmCheckitem - { - FSubsidiary = "(" + org.FNumber + ")" + org.Name, - mc = b.ItemName, - gg = b.ItemModel, - ItemNo = b.ItemNo, - }, true) + { + FSubsidiary = "(" + org.FNumber + ")" + org.Name, + mc = b.ItemName, + gg = b.ItemModel, + ItemNo = b.ItemNo + }, true) .Where(_sbWhere.ToString()) .OrderBy(_sbBy.ToString()) .ToPageList(query.currentPage, query.everyPageSize, @@ -76,14 +77,16 @@ [FromBody] MesQmCheckitem model) { var m = base.GetById(model.Guid); - System.Text.StringBuilder sbSql = new StringBuilder(); - sbSql.Append("select top 1 FSubsidiary,org.NAME as fName,org.FNumber, [item_name],[item_model],item_no from MES_ITEMS i left join SYS_ORGANIZATION org on i.FSubsidiary=org.FID where i.id=" + m.ItemId); + var sbSql = new StringBuilder(); + sbSql.Append( + "select top 1 FSubsidiary,org.NAME as fName,org.FNumber, [item_name],[item_model],item_no from MES_ITEMS i left join SYS_ORGANIZATION org on i.FSubsidiary=org.FID where i.id=" + + m.ItemId); try { - DataSet dset = new DataSet(); - dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString()); - System.Data.DataRow r = dset.Tables[0].Rows[0]; - m.FSubsidiary ="("+ r["FNumber"].ToString() + ")"+ r["fName"].ToString(); + var dset = new DataSet(); + dset = DbHelperSQL.Query(sbSql.ToString()); + var r = dset.Tables[0].Rows[0]; + m.FSubsidiary = "(" + r["FNumber"] + ")" + r["fName"]; m.ItemNo = r["item_no"].ToString(); m.gg = r["item_model"].ToString(); m.mc = r["item_name"].ToString(); @@ -92,6 +95,7 @@ { LogHelper.Debug(ToString(), "GetModel error锛�" + ex.Message); } + m.list = Db.Queryable<MesQmCheckitemDt, MesQmAql1>((a, b) => new object[] { @@ -123,8 +127,10 @@ { var cont = IsChkOrUnChk(model.Guid.ToString()); if (cont > 0) - return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "淇敼澶辫触锛岃淇℃伅宸茶瀹℃牳锛�"); + return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, + "淇敼澶辫触锛岃淇℃伅宸茶瀹℃牳锛�"); } + try { Db.Ado.BeginTran(); @@ -219,8 +225,9 @@ it.Guid == Guid.Parse(_guid) && it.FoneChecked == true).Count; return cont; } + /// <summary> - /// 澶嶅埗鐗╂枡椤圭洰 + /// 澶嶅埗鐗╂枡椤圭洰 /// </summary> /// <param name="model"></param> /// <returns></returns> @@ -230,7 +237,7 @@ int? rtnInt = (int)ReturnCode.Default; string inSourceGuid = model.sourceGuid; string inMxGuids = model.itemGuids; - string strType=model.iqcType; + string strType = model.iqcType; var _outMsg = ""; var _outSum = -1; using (var conn = new SqlConnection(DbHelperSQL.strConn)) @@ -245,10 +252,10 @@ { new("@outMsg", SqlDbType.NVarChar, 300), new("@outSum", SqlDbType.Int), - new("@inSourceGuid",inSourceGuid), + new("@inSourceGuid", inSourceGuid), new("@inMxGuids", inMxGuids), new("@iqcType", strType), - new("@inEdtUserGuid", _userGuid), + new("@inEdtUserGuid", _userGuid) }; parameters[0].Direction = ParameterDirection.Output; parameters[1].Direction = ParameterDirection.Output; @@ -271,6 +278,7 @@ } } } + if (_outSum <= 0) return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, _outMsg); @@ -278,7 +286,6 @@ } /// <summary> - /// /// </summary> /// <param name="mode"></param> /// <returns></returns> @@ -329,6 +336,7 @@ } } } + return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�"); } } \ No newline at end of file -- Gitblit v1.9.3