From 4c7cb8434be52f1de8557c069ebf82dfbfd8d6ee Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 05 十一月 2025 15:29:46 +0800
Subject: [PATCH] 增加凯贝装箱单
---
WebAPI/Controllers/项目管理/报表分析/PM_ReportController.cs | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 164 insertions(+), 6 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
index 4748a1d..8abfa00 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ReportController.cs"
@@ -203,18 +203,176 @@
objJsonResult.data = null;
return objJsonResult;
}
+ string sql = "exec h_p_My_PM_ProjectReportBill " + user+",0,''";
+ ds=oCn.RunProcReturn(sql, "h_p_My_PM_ProjectReportBill");
- if (sWhere == null || sWhere.Equals(""))
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- ds = oCn.RunProcReturn("select * from h_v_PM_ProjectBillMYList order by 鍗曟嵁鍙� desc", "h_v_PM_ProjectBillMYList");
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- else
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎶慨闄勫睘宸ヨ垂鎶ヨ〃 鏌ヨ
+ [Route("PM_ReportController/GetPM_ProjectRepairTaskOtherMoneyReport")]
+ [HttpGet]
+ public object GetPM_ProjectRepairTaskOtherMoneyReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProjectID = dic["HProjectID"].ToString();//宸ョ▼椤圭洰ID
+
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectRepairTaskOtherMoneyReport '" + HBeginDate + "','" + HEndDate + "','" + HProjectID + "'", "h_p_PM_ProjectRepairTaskOtherMoneyReport");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- string sql1 = "select * from h_v_PM_ProjectBillMYList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
- ds = oCn.RunProcReturn(sql, "h_v_PM_ProjectBillMYList");
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎶慨璐圭敤姹囨�昏〃 鏌ヨ
+ [Route("PM_ReportController/GetPM_ProjectRepairTaskSumMoneyReport")]
+ [HttpGet]
+ public object GetPM_ProjectRepairTaskSumMoneyReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProjectID = dic["HProjectID"].ToString();//宸ョ▼椤圭洰ID
+
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectRepairTaskSumMoneyReport '" + HBeginDate + "','" + HEndDate + "','" + HProjectID + "'", "h_p_PM_ProjectRepairTaskSumMoneyReport");
+
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎶慨姹囨�昏〃 鏌ヨ
+ [Route("PM_ReportController/GetPM_ProjectRepairTaskSumReport")]
+ [HttpGet]
+ public object GetPM_ProjectRepairTaskSumReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectRepairTaskSumReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_PM_ProjectRepairTaskSumReport");
+
+ //娣诲姞鍒楀悕
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎶慨鑰冩牳鍑哄嫟鏄庣粏琛� 鏌ヨ
+ [Route("PM_ReportController/GetPM_ProjectRepairTaskExamMoneyReport")]
+ [HttpGet]
+ public object GetPM_ProjectRepairTaskExamMoneyReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+ string HProjectID = dic["HProjectID"].ToString();//宸ョ▼椤圭洰ID
+
+ ds = oCn.RunProcReturn("exec h_p_PM_ProjectRepairTaskExamMoneyReport '" + HBeginDate + "','" + HEndDate + "','" + HProjectID + "'", "h_p_PM_ProjectRepairTaskExamMoneyReport");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
--
Gitblit v1.9.1