From a0586edd1c53e6c7065fd2a90809ecb4fa293922 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 12 十一月 2024 17:43:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Pay_ReportController.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/Pay_ReportController.cs b/WebAPI/Controllers/Pay_ReportController.cs
index 430f600..ac86a0f 100644
--- a/WebAPI/Controllers/Pay_ReportController.cs
+++ b/WebAPI/Controllers/Pay_ReportController.cs
@@ -594,5 +594,50 @@
return objJsonResult;
}
#endregion
+
+ #region [绯荤粺璁′欢鎶ヨ〃]
+ [Route("Pay_PaymentEntryReport/list")]
+ [HttpGet]
+ public object Pay_PaymentEntryReport(string sWhere, string user)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Pay_PaymentEntryReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("exec h_p_Pay_PaymentEntryReport" + sWhere, "h_p_Pay_PaymentEntryReport");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1