From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.BaseInfo/Services/MesItemsManager.cs | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 95 insertions(+), 66 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs b/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
index dd4f9b6..d84b0a7 100644
--- a/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/MesItemsManager.cs
@@ -1,4 +1,8 @@
-锘縰sing Gs.BaseInfo.Models;
+锘縰sing System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using System.Text;
+using Gs.BaseInfo.Models;
using Gs.Entity.BaseInfo;
using Gs.Entity.Sys;
using Gs.Toolbox;
@@ -8,10 +12,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
-using System.Data;
-using System.Data.SqlClient;
-using System.Dynamic;
-using System.Text;
using SqlDataAdapter = System.Data.SqlClient.SqlDataAdapter;
namespace Gs.BaseInfo.Services;
@@ -42,24 +42,25 @@
try
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy =
+ new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
var itemsList = Db
.Queryable<MesItems, SysOrganization, MesUnit, MesUnit, MesUnit,
- MesUnit, MesUnit, MesUnit, MesDepots, MesItemType>(
- (a, org, c, d, e, f, g, h, m,n) => new object[]
- {
- JoinType.Left, a.FSubsidiary == org.Fid,
- JoinType.Left, a.ItemUnit == c.Id.ToString(),
- JoinType.Left, a.Fpurchaseunitid == d.Id.ToString(),
- JoinType.Left, a.Saleunit == e.Id.ToString(),
- JoinType.Left, a.Storeunit == f.Id.ToString(),
- JoinType.Left, a.SubconUnit == g.Id.ToString(),
- JoinType.Left, a.ProduceUnit == h.Id.ToString(),
- JoinType.Left, a.DepotCode == m.DepotId.ToString(),
- JoinType.Left, a.Fmaterialgroup == n.Id.ToString()
- })
- .Select((a, org, c, d, e, f, g, h, m,n) => new MesItems
+ MesUnit, MesUnit, MesUnit, MesDepots, MesItemType>((a, org,
+ c, d, e, f, g, h, m, n) => new object[]
+ {
+ JoinType.Left, a.FSubsidiary == org.Fid,
+ JoinType.Left, a.ItemUnit == c.Id.ToString(),
+ JoinType.Left, a.Fpurchaseunitid == d.Id.ToString(),
+ JoinType.Left, a.Saleunit == e.Id.ToString(),
+ JoinType.Left, a.Storeunit == f.Id.ToString(),
+ JoinType.Left, a.SubconUnit == g.Id.ToString(),
+ JoinType.Left, a.ProduceUnit == h.Id.ToString(),
+ JoinType.Left, a.DepotCode == m.DepotId.ToString(),
+ JoinType.Left, a.Fmaterialgroup == n.Id.ToString()
+ })
+ .Select((a, org, c, d, e, f, g, h, m, n) => new MesItems
{
chkInt = false,
FSubsidiary = "(" + org.FNumber + ")" + org.Name,
@@ -70,15 +71,21 @@
SubconUnit = g.Fname,
ProduceUnit = h.Fname,
DepotCode = m.DepotName,
- Fmaterialgroup=n.Tname,
- Fforbidstatus = a.Fforbidstatus + ":" + (a.Fforbidstatus == "A" ? "姝ｅ父" : "绂佺敤"),
+ Fmaterialgroup = n.Tname,
+ Fforbidstatus = a.Fforbidstatus + ":" +
+ (a.Fforbidstatus == "A" ? "姝ｅ父" : "绂佺敤"),
DataType = a.DataType + ":"
- + SqlFunc.IF(a.DataType == "Z").Return("鏆傚瓨")
- .ElseIF(a.DataType == "A").Return("鍒涘缓")
- .ElseIF(a.DataType == "B").Return("瀹℃牳涓�")
- .ElseIF(a.DataType == "C").Return("宸插鏍�")
- .ElseIF(a.DataType == "D").Return("閲嶆柊瀹℃牳")
- .End(a.DataType)
+ + SqlFunc.IF(a.DataType == "Z")
+ .Return("鏆傚瓨")
+ .ElseIF(a.DataType == "A")
+ .Return("鍒涘缓")
+ .ElseIF(a.DataType == "B")
+ .Return("瀹℃牳涓�")
+ .ElseIF(a.DataType == "C")
+ .Return("宸插鏍�")
+ .ElseIF(a.DataType == "D")
+ .Return("閲嶆柊瀹℃牳")
+ .End(a.DataType)
}, true)
.Where(_sbWhere.ToString())
.OrderBy(_sbBy.ToString())
@@ -110,12 +117,13 @@
dynamic m = new ExpandoObject();
SqlParameter[] parameters =
{
- new("@inMainGuid", guid),
+ new("@inMainGuid", guid)
};
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[prc_item_detail]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[prc_item_detail]", parameters,
+ "0");
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0)
{
@@ -135,7 +143,6 @@
}
/// <summary>
- ///
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -148,25 +155,30 @@
SqlParameter[] parameters =
{
new("@inItemNo", itemNo),
- new("@inOrgId", orgId),
+ new("@inOrgId", orgId)
};
var dset = new DataSet();
try
{
- dset = DbHelperSQL.RunProcedure("[prc_item_detailByOrg]", parameters, "0");
+ dset = DbHelperSQL.RunProcedure("[prc_item_detailByOrg]",
+ 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();
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "璇诲彇鎴愬姛锛�");
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
+ "璇诲彇鎴愬姛锛�");
}
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛屾壘涓嶅埌璇ョ墿鏂欙紒");
+
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛屾壘涓嶅埌璇ョ墿鏂欙紒");
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), ex.Message);
- return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default, "璇诲彇澶辫触锛�" + ex.Message.ToString());
+ return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
+ "璇诲彇澶辫触锛�" + ex.Message);
}
}
@@ -184,7 +196,7 @@
string sortName = model.sortName;
string keyWhere = model.keyWhere;
string keyType = model.keyType;
- string keyWord = model.keyWord; //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
+ string keyWord = model.keyWord; //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
var dset = new DataSet();
try
{
@@ -201,7 +213,8 @@
new("@inSortName", sortName),
new("@inSortOrder", ""),
new("@inQueryWhere", keyWhere),
- new("@inP1",keyType),//褰撲负锛氭楠岄」鐩紝iqc,ipqc,fqc鏃讹紝鍏嶆鏃� 鐗瑰埆鍔犱笂杩囨护鏉′欢
+ new("@inP1",
+ keyType), //褰撲负锛氭楠岄」鐩紝iqc,ipqc,fqc鏃讹紝鍏嶆鏃� 鐗瑰埆鍔犱笂杩囨护鏉′欢
new("@inP2", keyWord) //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
};
foreach (var parameter in parameters)
@@ -211,13 +224,15 @@
dt.Fill(dset, "0");
}
}
+
conn.Close();
}
}
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
var _pglist = new PageList<dynamic>
@@ -247,7 +262,6 @@
}
-
/// <summary>
/// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�,鐢ㄤ簬鍚勭缁戝畾
/// </summary>
@@ -258,29 +272,36 @@
{
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName) ? "a.staff_no" : model.sortName;
+ var sortName = string.IsNullOrEmpty(model.sortName)
+ ? "a.staff_no"
+ : model.sortName;
var keyWhere = model.keyWhere;
- string keyType = model.keyType;
- System.Text.StringBuilder sbJoin = new StringBuilder();
+ var keyType = model.keyType;
+ var sbJoin = new StringBuilder();
sbJoin.Append(" FROM MES_ITEMS [a]");
- sbJoin.Append(" Left JOIN [SYS_ORGANIZATION] [Org] ON ( [a].[FSubsidiary] = [Org].[FID] )");
- sbJoin.Append(" left join SYS_USER_BIND b on (b.userGuid='" + keyType + "' and b.aboutGuid=a.item_id and b.fType='鐗╂枡鍒嗗尯')");
+ sbJoin.Append(
+ " Left JOIN [SYS_ORGANIZATION] [Org] ON ( [a].[FSubsidiary] = [Org].[FID] )");
+ sbJoin.Append(" left join SYS_USER_BIND b on (b.userGuid='" + keyType +
+ "' and b.aboutGuid=a.item_id and b.fType='鐗╂枡鍒嗗尯')");
sbJoin.Append(" where 1=1 ");
sbJoin.Append(keyWhere);
var sbSql = new StringBuilder();
sbSql.Append(" SELECT * FROM ");
- sbSql.Append(" (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2]");
- sbSql.Append(" ,a.item_id,a.item_no,a.item_name,a.item_model,a.guid,ROW_NUMBER() OVER(ORDER BY org.FNumber asc ,a.item_no asc) AS RowIndex ");
+ sbSql.Append(
+ " (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2]");
+ sbSql.Append(
+ " ,a.item_id,a.item_no,a.item_name,a.item_model,a.guid,ROW_NUMBER() OVER(ORDER BY org.FNumber asc ,a.item_no asc) AS RowIndex ");
//濡傛灉鏃犲叧閿瓧锛屾棤闇�鎵炬煡缁戝畾
if (string.IsNullOrEmpty(keyType))
- {
sbSql.Append(",cast(0 as bit) as chkInt");
- }
else
- sbSql.Append(",cast( (case when b.guid is null then 0 else 1 end) as bit) as chkInt ");
+ sbSql.Append(
+ ",cast( (case when b.guid is null then 0 else 1 end) as bit) as chkInt ");
sbSql.Append(sbJoin);
sbSql.Append(") T");
- sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and T.rowindex<=" + currentPage + "*" + everyPageSize);
+ sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
+ everyPageSize + " and T.rowindex<=" + currentPage + "*" +
+ everyPageSize);
sbSql.Append(" select count(1) as intTotal ");
sbSql.Append(sbJoin);
var dset = new DataSet();
@@ -291,8 +312,10 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage2 error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
+
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -303,7 +326,8 @@
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 intTotal =
+ int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
var pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
: intTotal / everyPageSize;
@@ -313,13 +337,14 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
+
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
/// <summary>
- /// 鎵归噺璁剧疆鎻愬墠鍒拌揣鏃ユ湡
+ /// 鎵归噺璁剧疆鎻愬墠鍒拌揣鏃ユ湡
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -329,25 +354,29 @@
string guidList = model.guidList;
string bz10 = model.bz10;
string percent = model.percent;
- int rtnInt = (int)ReturnCode.Default;
+ var rtnInt = (int)ReturnCode.Default;
try
{
- StringBuilder strSql = new StringBuilder();
- strSql.Append(" update MES_ITEMS set bz10=" + bz10.Trim() + " ," + "loss_percent = " + percent.Trim() + " ");
- strSql.Append(" where guid in (select line from dbo.fn_split('" + guidList + "',','))");
- int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+ var strSql = new StringBuilder();
+ strSql.Append(" update MES_ITEMS set bz10=" + bz10.Trim() + " ," +
+ "loss_percent = " + percent.Trim() + " ");
+ strSql.Append(" where guid in (select line from dbo.fn_split('" +
+ guidList + "',','))");
+ var rows = DbHelperSQL.ExecuteSql(strSql.ToString());
rtnInt = rows;
}
catch (Exception ex)
{
- LogHelper.Debug(this.ToString(), "SetDays error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "SetDays error锛�" + ex.Message);
rtnInt = (int)ReturnCode.Exception;
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
+ return ReturnDto<int>.QuickReturn(default(int?),
+ ReturnCode.Exception, "鎿嶄綔澶辫触锛�" + ex.Message);
}
- if (rtnInt > 0)
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- else
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
- }
+ if (rtnInt > 0)
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success,
+ "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
+ "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3