From 34c5c1737a20c8bd1fb8090a08d4bcbcc8d60cf8 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:20:31 +0800
Subject: [PATCH] 修改了 模具、设备保养、维修、点检方法
---
WebAPI/Controllers/ReportFromController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/ReportFromController.cs b/WebAPI/Controllers/ReportFromController.cs
index a08ed7a..86dd5ee 100644
--- a/WebAPI/Controllers/ReportFromController.cs
+++ b/WebAPI/Controllers/ReportFromController.cs
@@ -8,6 +8,7 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.DbUntil;
namespace WebAPI.Controllers
{
@@ -24,7 +25,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 +40,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)
{
@@ -81,5 +84,48 @@
return objJsonResult;
}
#endregion
+
+
+ #region [鍔ㄦ�佸垪琛�2]
+ [Route("Sc_MESReportFrom/ReportFromBillList2")]
+ [HttpGet]
+ public object ReportFromBillList2(string sWhere)
+ {
+ try
+ {
+ string sql = "select HItemID,HNumber 浠ｇ爜,HName 鍚嶇О from Gy_Process where 1 = 1 " + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "Gy_Employee");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = DataFormatUntil.BackRowCount(sql, "Gy_Employee");
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = DataFormatUntil.BackColTitle(ds);
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = DataFormatUntil.BackColTitle(ds);
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
}
}
+
\ No newline at end of file
--
Gitblit v1.9.1