From f7333114101cd5dc083541444f29640ff4a54426 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 12 八月 2024 08:54:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Sb_EquipReportController.cs | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
index 28d4597..4d9699b 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
@@ -233,5 +233,47 @@
}
#endregion
+
+ #region 璁惧缁翠慨璁板綍鎶ヨ〃
+
+ /// <summary>
+ /// 璁惧缁翠慨璁板綍鎶ヨ〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipReportController/GetSb_EquipRepairReport_Json")]
+ [HttpGet]
+ public object GetSb_EquipRepairReport_Json(DateTime HBeginDate, DateTime HEndDate, Int64 HStockOrgID, string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipRepairReport '" + HBeginDate.ToShortDateString() + "','" + HEndDate.ToShortDateString() + "'," + HStockOrgID.ToString() + "," + sWhere, "h_p_Sb_EquipRepairReport");
+ 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 = "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 = "杩斿洖鎶ヨ〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
}
}
--
Gitblit v1.9.1