From 00e25e4a9c9bd2fc91558c3c1a68f47db6d08b1d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 七月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MateOutController.cs | 326 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 296 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 60dcf48..07bb27f 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1350,10 +1350,19 @@
#region 鐧藉澂鍙戝竷姹囨�绘姤琛�
[Route("MaterOutSumReport/MaterOutSumReport_Cloth")]
[HttpGet]
- public object MaterOutSumReport_Cloth(string sWhere)
+ public object MaterOutSumReport_Cloth(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutSumReport_Cloth", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1417,10 +1426,19 @@
#region 鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃
[Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")]
[HttpGet]
- public object MaterOutEntryReport_Cloth(string sWhere)
+ public object MaterOutEntryReport_Cloth(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutEntryReport_Cloth", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1480,10 +1498,19 @@
#region 鏌撳巶姹囨�绘姤琛�
[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")]
[HttpGet]
- public object ProdProcessSumReport_DyeColor(string sWhere)
+ public object ProdProcessSumReport_DyeColor(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1536,10 +1563,19 @@
#region 鏌撳巶鏄庣粏鎶ヨ〃
[Route("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")]
[HttpGet]
- public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo)
+ public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessEntryReport_DyeColor", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1585,10 +1621,19 @@
#region 鏌撳巶浜ч噺鎶ヨ〃
[Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")]
[HttpGet]
- public object ProdProcessSumReport_DyeColor_third(string sWhere)
+ public object ProdProcessSumReport_DyeColor_third(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor_third", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString());
@@ -1597,7 +1642,8 @@
"and (浜у搧浠ｇ爜=''" + com.HMaterNumber + "'' or ''" + com.HMaterNumber + "''='''') " +
"and (鐢熶骇璁㈠崟鍙�=''" + com.HBillNo + "'' or ''" + com.HBillNo + "''='''') " +
"and (浜у搧鍚嶇О=''" + com.HProductName + "'' or ''" + com.HProductName + "''='''') " +
- "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch;
+ "and (浜у搧瑙勬牸=''" + com.HProductModel + "'' or ''" + com.HProductModel + "''='''') " + com.RandomSearch +
+ " " + com.OtherSearch; ;
ds = oCN.RunProcReturn($"exec h_p_Kf_ProdProcessSumReport_DyeColor_third '{sql}'", "h_p_Kf_ProdProcessSumReport_DyeColor_third");
@@ -1632,10 +1678,19 @@
#region 鐑樺共瀹氬瀷鍑虹珯
[Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")]
[HttpGet]
- public object Kf_DryFinalizeOutReport(string sWhere)
+ public object Kf_DryFinalizeOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_DryFinalizeOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport");
//鑾峰彇鍒楀悕
@@ -1669,10 +1724,19 @@
#region 涓婃祮瀹氬瀷鍑虹珯
[Route("ProdProcessSumReport/Kf_SizingFinalizeOutReport")]
[HttpGet]
- public object Kf_SizingFinalizeOutReport(string sWhere)
+ public object Kf_SizingFinalizeOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_SizingFinalizeOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport");
//鑾峰彇鍒楀悕
@@ -1706,10 +1770,19 @@
#region 鍒锋瘺鍑虹珯
[Route("ProdProcessSumReport/Kf_BrushingOutReport")]
[HttpGet]
- public object Kf_BrushingOutReport(string sWhere)
+ public object Kf_BrushingOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_BrushingOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport");
//鑾峰彇鍒楀悕
@@ -1743,10 +1816,19 @@
#region 鑹插澂鐑厜鍑虹珯
[Route("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")]
[HttpGet]
- public object Kf_ColorBlankLustringOutReport(string sWhere)
+ public object Kf_ColorBlankLustringOutReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_ColorBlankLustringOutReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport");
//鑾峰彇鍒楀悕
@@ -1781,46 +1863,55 @@
#region 鍘嬫按鍑虹珯 姣涘皷鍑虹珯
[Route("ProdProcessSumReport/Kf_PressurizedWaterOutReport")]
[HttpGet]
- public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType)
+ public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log(HBillType, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
switch (HBillType)
{
- case "Kf_PressurizedWaterOutReport":
+ case "Kf_PressurizedWaterOutReport"://姣涘皷 鍘嬫按鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_PressurizedWaterOutReport where 1=1 " + sWhere, "h_v_Kf_PressurizedWaterOutReport");
break;
- case "Kf_HairtipReport":
+ case "Kf_HairtipReport"://姣涘皷 姣涘皷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_HairtipReport where 1=1 " + sWhere, "h_v_Kf_HairtipReport");
break;
- case "Kf_DigitalSprayPaintingReport":
+ case "Kf_DigitalSprayPaintingReport"://姣涘皷 鏁扮爜鍠疯姳鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_DigitalSprayPaintingReport where 1=1 " + sWhere, "h_v_Kf_DigitalSprayPaintingReport");
break;
- case "Kf_ShrinkBrushReport":
+ case "Kf_ShrinkBrushReport"://鍚庢暣浜屽彿 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushReport");
break;
- case "Kf_FinalizeTheDesignOutReport":
+ case "Kf_FinalizeTheDesignOutReport"://鍚庢暣浜屽彿 瀹氬瀷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeTheDesignOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeTheDesignOutReport");
break;
- case "Kf_LustringOutReport":
+ case "Kf_LustringOutReport"://鍚庢暣浜屽彿 鐑厜鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringOutReport where 1=1 " + sWhere, "h_v_Kf_LustringOutReport");
break;
- case "Kf_ShrinkBrushOutReport":
+ case "Kf_ShrinkBrushOutReport"://鍚庢暣涓�鍙� 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushOutReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushOutReport");
break;
- case "Kf_FinalizeOutReport":
+ case "Kf_FinalizeOutReport"://鍚庢暣涓�鍙� 瀹氬瀷鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeOutReport");
break;
- case "Kf_LustringReport":
+ case "Kf_LustringReport"://鍚庢暣涓�鍙� 鐑厜鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringReport where 1=1 " + sWhere, "h_v_Kf_LustringReport");
break;
- case "Kf_ShrinkBrushTeReport":
+ case "Kf_ShrinkBrushTeReport"://鐗规暣 缂╁埛鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport");
break;
- case "Kf_EmbossingOutReport":
+ case "Kf_EmbossingOutReport"://鐗规暣 鍘嬭姳鍑虹珯
ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport");
break;
- case "Kf_StereoscopicFlowerOutReport":
+ case "Kf_StereoscopicFlowerOutReport"://鐗规暣 绔嬩綋鑺卞瀷鏈哄嚭绔�
ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport");
break;
}
@@ -1854,6 +1945,67 @@
}
#endregion
+ #region 鍘嬫按鏈嚭绔欐姤琛� 鏌ヨ
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Kf_PressurizedWaterNoOutReport/list")]
+ [HttpGet]
+ public object GetKf_PressurizedWaterNoOutReport(string sWhere, string user, string userid)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Kf_PressurizedWaterNoOutReport_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鏌ヨ
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '','" + userid + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
+ }
+ else
+ {
+ string sql = "exec h_p_Kf_PressurizedWaterNoOutReport '" + sWhere + "','" + userid + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Kf_PressurizedWaterNoOutReport");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 棰嗘枡缁熻鎶ヨ〃
/// <summary>
/// 棰嗘枡缁熻鎶ヨ〃
@@ -1861,10 +2013,19 @@
/// <returns></returns>
[Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")]
[HttpGet]
- public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere)
+ public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Kf_MateOutSumReport_QiaoYi", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("exec h_p_Kf_MateOutSumReport_QiaoYi " + sWhere, "h_p_Kf_MateOutSumReport_QiaoYi");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1909,10 +2070,20 @@
#region (鐢熶骇璁㈠崟缁村害)瀹㈡埛璁㈠崟鎶ヨ〃
[Route("MaterOutEntryReport/sc_ICOMReportList")]
[HttpGet]
- public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate)
+ public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("sc_ICOMReportList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'";
ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport");
@@ -1991,10 +2162,19 @@
#region 娴佽浆鍗℃湭鍏ュ簱鎶ヨ〃
[Route("MaterOutEntryReport/Sc_ProcExchangeNoInReport")]
[HttpGet]
- public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate)
+ public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchangeNoInReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = "exec h_p_Sc_ProcExchangeNoInReport '" + sWhere + "','" + HBeginDate + "','" + HEndDate + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchangeNoInReport");
@@ -2032,10 +2212,19 @@
#region 鐢熶骇鍏ュ簱鎶ヨ〃
[Route("MaterOutEntryReport/sc_ICOMRKReport")]
[HttpGet]
- public object sc_ICOMRKReport(string sWhere)
+ public object sc_ICOMRKReport(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("sc_ICOMRKReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
string sql = "select * from h_v_sc_ICOMRKReport where 1=1 " + sWhere + " order by 鏃ユ湡 ";
ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKReport");
@@ -2082,6 +2271,15 @@
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_BadReasonReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
List<object> columnNameList = new List<object>();
if (sWhere == null || sWhere.Equals(""))
@@ -2176,11 +2374,20 @@
}
[Route("MaterOutEntryReport/SC_DayRkReport")]
[HttpGet]
- public object SC_DayRkReport(string sWhere,int num)
+ public object SC_DayRkReport(string sWhere,int num, string user)
{
try
{
- DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
+ if (!DBUtility.ClsPub.Security_Log("SC_DayRkReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
$",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'";
@@ -2252,10 +2459,19 @@
}
[Route("MaterOutEntryReport/SemiFinishedProductsReportList")]
[HttpGet]
- public object SemiFinishedProductsReportList(string sWhere, int num)
+ public object SemiFinishedProductsReportList(string sWhere, int num, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("SemiFinishedProductsReportList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere);
string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
@@ -2510,6 +2726,56 @@
}
#endregion
+
+ #region 鍒舵垚鐜囨槑缁嗘姤琛�
+ [Route("MaterOutEntryReport/Sc_ProductedRateReport")]
+ [HttpGet]
+ public object Sc_ProductedRateReport(string HBeginDate,string HEndDate,string sWhere,double HRate_BeyondICMOQty, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProductedRateReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_ProductedRateReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'," + HRate_BeyondICMOQty;
+
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_ProductedRateReport");
+
+ DataTable dt = ds.Tables[0];
+
+ //鑾峰彇鍒楀悕
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ 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.list = columnNameList;
+ objJsonResult.data = ds.Tables;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
--
Gitblit v1.9.1