From 4bf3ca7fc8e3cceba62d6617724cac3cbc919746 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 15 八月 2022 21:53:14 +0800
Subject: [PATCH] 工资系统部署测试
---
WebAPI/Controllers/ReportFromController.cs | 152 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 133 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/ReportFromController.cs b/WebAPI/Controllers/ReportFromController.cs
index d976e16..e1a30fa 100644
--- a/WebAPI/Controllers/ReportFromController.cs
+++ b/WebAPI/Controllers/ReportFromController.cs
@@ -152,24 +152,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (ds.Tables[4].Rows.Count > 0)
- {
- objJsonResult.code = "1";
- objJsonResult.count = ds.Tables[3].Rows.Count;
- objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
- objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[4], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
- objJsonResult.data = null;
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
+ //if (ds.Tables[4].Rows.Count > 0)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[3].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[4], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ // objJsonResult.data = null;
+ // objJsonResult.list = columnNameList;
+ // return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -265,6 +265,63 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ //if (ds.Tables[1].Rows.Count > 0)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ // objJsonResult.data = null;
+ // 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
+
+
+ #region [鍣ㄥ叿鏀跺彂鏂欐槑缁嗘姤琛ㄥ垪琛╙
+ [Route("Sc_MESReportFrom/ReportMaterialReceiptBillList")]
+ [HttpGet]
+ public object ReportMaterialReceiptBillList(int page, int limit, string HStartDate,string HEndDate, string HNumber, string HBarCode, string HSupName)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+
+
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceipt '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HBarCode + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceipt");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
if (ds.Tables[1].Rows.Count > 0)
{
objJsonResult.code = "1";
@@ -278,7 +335,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.Message = "鏃犳暟鎹紒";
objJsonResult.data = null;
objJsonResult.list = columnNameList;
return objJsonResult;
@@ -296,6 +353,63 @@
return objJsonResult;
}
#endregion
+
+ #region [鍣ㄥ叿鏀跺彂鏂欐眹鎬绘姤琛ㄥ垪琛╙
+ [Route("Sc_MESReportFrom/ReportMaterialReceiptBillSumList")]
+ [HttpGet]
+ public object ReportMaterialReceiptBillSumList(int page, int limit, string HStartDate, string HEndDate, string HNumber, string HSupName)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+
+
+ ds = oCN.RunProcReturn("exec h_p_Mes_ReportMaterialReceiptSum '" + HStartDate + "','" + HEndDate + "','" + HNumber + "','" + HSupName + "'," + pageSize + "," + pageNum + "", "h_p_Mes_ReportMaterialReceiptSum");
+ string aa = ds.Tables[0].Columns[0].ToString();
+
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[1].Rows.Count > 0)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[1], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳暟鎹紒";
+ // objJsonResult.data = null;
+ // 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