From 6b57612f6e9f7575d206e82955ffd989faaaf8b3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 13:24:15 +0800
Subject: [PATCH] 同步祈禧代码
---
WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs | 115 +++++++++++++++++++++------------------------------------
1 files changed, 42 insertions(+), 73 deletions(-)
diff --git a/WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs b/WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs
index 0d44219..06e6c55 100644
--- a/WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs
+++ b/WebApi/Gs.BaseInfo/Services/MesSupplierManager.cs
@@ -43,29 +43,22 @@
var _sbBy =
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
- var itemsList = Db
- .Queryable<MesSupplier, SysOrganization>((a, org) =>
- new object[]
+ var itemsList = Db.Queryable<MesSupplier, SysOrganization>(
+ (a, org) => new object[]
{
JoinType.Left, a.FSubsidiary == org.Fid
}
).Select((a, org) => new MesSupplier
{
FSubsidiary = "(" + org.FNumber + ")" + org.Name,
- Fforbidstatus = a.Fforbidstatus + ":" +
- (a.Fforbidstatus == "A" ? "姝ｅ父" : "绂佺敤"),
+ 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())
@@ -148,7 +141,6 @@
return ReturnDto<PageList<dynamic>>.QuickReturn(
default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
-
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -170,14 +162,14 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
/// <summary>
- /// 鍔犲叆srm鍚嶅崟
+ /// 鍔犲叆srm鍚嶅崟
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -186,106 +178,83 @@
{
string suppId = model.suppId;
string joinType = model.joinType;
- var rtnInt = (int)ReturnCode.Default;
+ int rtnInt = (int)ReturnCode.Default;
try
{
- var strSql = new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append(" delete from MES_SUPPLIER_SRM ");
strSql.Append(" where suppId='" + suppId + "'");
- var rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+ int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
if (joinType == "1")
{
strSql = new StringBuilder();
- strSql.Append(
- " insert into MES_SUPPLIER_SRM(suppId,isSrm,create_by,create_date)");
- strSql.Append(" values('" + suppId + "',1,'" + _userCode +
- "',getdate())");
+ strSql.Append(" insert into MES_SUPPLIER_SRM(suppId,isSrm,create_by,create_date)");
+ strSql.Append(" values('" + suppId + "',1,'" + _userCode + "',getdate())");
rows = DbHelperSQL.ExecuteSql(strSql.ToString());
}
-
rtnInt = rows;
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), "DeleteModel error锛�" + ex.Message);
+ LogHelper.Debug(this.ToString(), "DeleteModel 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,
- "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception,
- "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ else
+ return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鎿嶄綔澶辫触锛岃閲嶈瘯锛�");
}
/// <summary>
- /// 璇诲彇srm鍒楄〃
+ /// 璇诲彇srm鍒楄〃
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[RequestMethod(RequestMethods.POST)]
- public ReturnDto<PageList<dynamic>> GetSrmListPage(
- [FromBody] PageQuery model)
+ public ReturnDto<PageList<dynamic>> GetSrmListPage([FromBody] PageQuery model)
{
- var currentPage = model.currentPage;
- var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName)
- ? "a.supp_name"
- : model.sortName;
- var keyWhere = model.keyWhere;
- var sbSql = new StringBuilder();
+ int currentPage = model.currentPage;
+ int everyPageSize = model.everyPageSize;
+ string sortName = string.IsNullOrEmpty(model.sortName) ? "a.supp_name" : model.sortName;
+ string keyWhere = model.keyWhere;
+ System.Text.StringBuilder sbSql = new StringBuilder();
sbSql.Append("select * from ");
sbSql.Append("( ");
- sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
- sortName + " " + model.sortOrder +
- ") as rowIndex,a.*,b.create_date as joinDate,'(' + org.FNumber + ')' + org.Name as orgName from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join SYS_ORGANIZATION org on org.FID=a.FSubsidiary where 1=1" +
- keyWhere);
+ sbSql.Append("select top 100000 ROW_NUMBER() over(order by " + sortName + " " + model.sortOrder + ") as rowIndex,a.*,b.create_date as joinDate,'(' + org.FNumber + ')' + org.Name as orgName from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join SYS_ORGANIZATION org on org.FID=a.FSubsidiary where 1=1" + keyWhere);
sbSql.Append(") as 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(" order by rowindex asc ");
- sbSql.Append(
- " select count(1) as intTotal from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join SYS_ORGANIZATION org on org.FID=a.FSubsidiary where 1=1 " +
- keyWhere);
- var dset = new DataSet();
+ sbSql.Append(" select count(1) as intTotal from [dbo].[MES_SUPPLIER_SRM] b left join [dbo].[MES_SUPPLIER] a on b.suppId=a.[id] left join SYS_ORGANIZATION org on org.FID=a.FSubsidiary where 1=1 " + keyWhere);
+ DataSet dset = new DataSet();
try
{
- dset = DbHelperSQL.Query(sbSql.ToString());
+ dset = Gs.Toolbox.DbHelperSQL.Query(sbSql.ToString());
}
catch (Exception ex)
{
- LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(
- default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ Gs.Toolbox.LogHelper.Debug(this.ToString(), "GetListPage error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
-
- var _pglist = new PageList<dynamic>
+ PageList<dynamic> _pglist = new PageList<dynamic>
{
total = 0,
everyPageSize = 0,
pages = 0,
list = new List<dynamic>()
};
- if (dset != null && dset.Tables.Count > 0 &&
- dset.Tables[0].Rows.Count > 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;
+ int intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ int pages = (intTotal % everyPageSize != 0) ? (intTotal / everyPageSize + 1) : (intTotal / everyPageSize);
_pglist.total = intTotal;
_pglist.everyPageSize = everyPageSize;
_pglist.pages = pages;
- var _dy = dset.Tables[0].TableToDynamicList();
+ List<dynamic> _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
- return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
- ReturnCode.Success, "璇诲彇鎴愬姛");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist, ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
}
\ No newline at end of file
--
Gitblit v1.9.3