From 92a53ebb95ff8af7eeb29578728e097f09941949 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 28 四月 2026 15:35:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/生产管理/设备状态分步/Sc_HEquipStateDistributionController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..7b6350d 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"
@@ -196,7 +196,7 @@
// 璁板綍閮ㄩ棬鏄惁宸茬粡鍔犲叆treeArr(涓嶅彲閲嶅鍔犲叆)
HashSet<String> HDeptSet = new HashSet<String>();
- ds = oCN.RunProcReturn($@"select hmainid HEquipID, 璁惧鍚嶇О HEquipName, HDeptID HDeptID, 浣跨敤閮ㄩ棬 HDeptName from h_v_Gy_EquipFileMainList
+ ds = oCN.RunProcReturn($@"select hmainid HEquipID, 璁惧缂栫爜 HEquipName, HDeptID HDeptID, 浣跨敤閮ㄩ棬 HDeptName from h_v_Gy_EquipFileMainList
{sWhere}
order by HEquipName asc", "h_v_Gy_EquipFileMainList");
@@ -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