From b08054592e47cb9e47cf34acb6965a08745e13ce Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 20 四月 2026 10:22:19 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
index fb5f0c9..73af695 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201\345\210\206\346\255\245/Sc_HEquipStateDistributionController.cs"
@@ -248,7 +248,7 @@
}
#endregion
- #region 璁惧杩愯鍒囩墖 杩斿洖璁惧鐘舵�� 鍥捐〃鏁版嵁
+ #region 璁惧杩愯鍒囩墖 杩斿洖璁惧鐘舵�� 鍥捐〃鏁版嵁 (楗煎浘)
[Route("DAQ_EquipRunningSlice/GetHEquipStatusReportList_DAQ")]
[HttpGet]
public object GetHEquipStatusReportList_DAQ(string HEquipID, string HDeptID, string HBeginDate, string HEndDate, string user)
@@ -284,7 +284,88 @@
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧杩愯鍒囩墖 杩斿洖璁惧鐘舵�� 鍥捐〃鏁版嵁 (鏃跺簭鍥�)
+ [Route("DAQ_EquipRunningSlice/GetHEquipStatusReportList2_DAQ")]
+ [HttpGet]
+ public object GetHEquipStatusReportList2_DAQ(string HEquipID, string HDeptID, string HBeginDate, string HEndDate, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn($@"exec h_p_DAQ_EquipTimeLineReport {HEquipID}, {HDeptID}, N'{HBeginDate}', N'{HEndDate}'", "h_p_DAQ_EquipTimeLineReport");
+
+
+ // 鍒濆鍖栫粨鏋� JObject
+ JObject result = new JObject();
+ // 鎸夋椂闂村琛ㄦ煡璇㈠嚭鏉ョ殑鏁版嵁杩涜鍒嗙粍
+ DataTable table = ds.Tables[0];
+ var groupedData = table.Rows.Cast<DataRow>()
+ .GroupBy(row =>
+ {
+ // 鍙栧嚭鏃堕棿瀛楁骞惰浆涓烘棩鏈燂紙鑷姩蹇界暐鏃跺垎绉掞級
+ DateTime time = Convert.ToDateTime(row["鏃堕棿"]);
+ string deptId = row["HDeptID"].ToString();
+
+ return new
+ {
+ HDate = time.ToString("yyyy-MM-dd"),
+ HDeptID = deptId
+ };// 鍒嗙粍 Key
+ });
+
+ foreach (var group in groupedData)
+ {
+ string dateKey = group.Key.HDate + "_" + HDeptID;
+ JArray dataArray = new JArray();
+
+ foreach (DataRow row in group)
+ {
+ JObject rowObj = new JObject();
+
+ // 鎶婅繖涓�琛岀殑鎵�鏈夊垪閮借浆鎴� ECharts鍙互璇诲彇鐨刣ata瀵硅薄
+ foreach (DataColumn col in table.Columns)
+ {
+
+ rowObj[col.ColumnName] = row[col] != DBNull.Value
+ ? JToken.FromObject(row[col])
+ : null;
+ }
+
+ dataArray.Add(rowObj);
+ }
+
+ // 鍔犲叆鏈�缁堢粨鏋�
+ result[dateKey] = dataArray;
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = result;
objJsonResult.list = columnNameList;
return objJsonResult;
}
--
Gitblit v1.9.1