From 78ff1efa3f21c9cb330338d00c378b79c9df2b7f Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 03 九月 2021 18:04:18 +0800
Subject: [PATCH] 进站单上道工序转序检验，出站单当前工序首件检验
---
WebAPI/Controllers/ReportFromController.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/ReportFromController.cs b/WebAPI/Controllers/ReportFromController.cs
index a08ed7a..8e94ef6 100644
--- a/WebAPI/Controllers/ReportFromController.cs
+++ b/WebAPI/Controllers/ReportFromController.cs
@@ -24,7 +24,7 @@
[HttpGet]
public object ReportFrom(int page,int limit,string sWhere)
{
- List<string> columnNameList = new List<string>();
+ List<object> columnNameList = new List<object>();
try
{
int count = 0;
@@ -39,16 +39,18 @@
sWhere = " where 1=1" + sWhere;
}
- count = new SQLHelper.ClsCN().RunProcReturn("select HItemID,HNumber 鐗╂枡缂栫爜,HName 鐗╂枡鍚嶇О,HRemark 璇存槑,HUseFlag 浣跨敤鐘舵��,HBirthDay 鐢熸棩 from Gy_Employee " + sWhere, "Gy_Employee").Tables[0].Rows.Count;
- string sql = string.Format(@"select top " + pageSize + " HItemID,HNumber 鐗╂枡缂栫爜,HName 鐗╂枡鍚嶇О,HRemark 璇存槑,HUseFlag 浣跨敤鐘舵��,HBirthDay 鐢熸棩 from(select row_number() over (order by HBirthDay desc) as RowNumber,HItemID,HNumber,HName ,HRemark,HUseFlag,HBirthDay from Gy_Employee " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ count = new SQLHelper.ClsCN().RunProcReturn("select HItemID,HNumber 缂栫爜,HName 濮撳悕,HRemark 璇存槑,HUseFlag 浣跨敤鐘舵��,HBirthDay 鐢熸棩 from Gy_Employee " + sWhere, "Gy_Employee").Tables[0].Rows.Count;
+ string sql = string.Format(@"select top " + pageSize + " HItemID,HNumber 缂栫爜,HName 濮撳悕,HRemark 璇存槑,HUseFlag 浣跨敤鐘舵��,HBirthDay 鐢熸棩 from(select row_number() over (order by HBirthDay desc) as RowNumber,HItemID,HNumber,HName ,HRemark,HUseFlag,HBirthDay from Gy_Employee " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
ds=new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
string aa = ds.Tables[0].Columns[0].ToString();
foreach (DataColumn col in ds.Tables[0].Columns)
{
- columnNameList.Add(col.ColumnName);//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- //JsonConvert.SerializeObject(ds.Tables[0], Formatting.Indented, new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd" })
if (ds.Tables[0].Rows.Count > 0)
{
@@ -83,3 +85,4 @@
#endregion
}
}
+
\ No newline at end of file
--
Gitblit v1.9.1