From 1612ed3498dce336a5d7dd895ae27fe41b334a12 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 20 四月 2026 10:16:06 +0800
Subject: [PATCH] 调整 设备运行切片 图表数据 (饼图) 返回数据，添加 按日期 降序排序 调整 设备运行切片 图表数据 (时序图) 修改 返回对象的key为 HDate_HEquipID
---
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 73af695..0ad2747 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"
@@ -270,7 +270,7 @@
{
sql += $"and (鎵�灞炴棩鏈� between CONVERT(DATETIME, '{HBeginDate} 00:00:00', 120) AND CONVERT(DATETIME, '{HEndDate} 23:59:59', 120))";
}
-
+ sql += " order by 鎵�灞炴棩鏈� desc";
ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");
//娣诲姞鍒楀悕
@@ -320,18 +320,18 @@
{
// 鍙栧嚭鏃堕棿瀛楁骞惰浆涓烘棩鏈燂紙鑷姩蹇界暐鏃跺垎绉掞級
DateTime time = Convert.ToDateTime(row["鏃堕棿"]);
- string deptId = row["HDeptID"].ToString();
+ string _HEquipID = row["HEquipID"].ToString();
return new
{
HDate = time.ToString("yyyy-MM-dd"),
- HDeptID = deptId
- };// 鍒嗙粍 Key
+ HEquipID = _HEquipID
+ };// 鍒嗙粍 Key HDate_HEquipID
});
foreach (var group in groupedData)
{
- string dateKey = group.Key.HDate + "_" + HDeptID;
+ string dateKey = group.Key.HDate + "_" + group.Key.HEquipID;
JArray dataArray = new JArray();
foreach (DataRow row in group)
--
Gitblit v1.9.1