From 18966e02fb573c7e2bb0c6426ed792b38b910940 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 19 9月 2025 15:37:55 +0800
Subject: [PATCH] 333
---
siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs b/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
index a509f97..4cfade7 100644
--- a/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
+++ b/siemenswmssditcode/wmsService/wcftest/wcf/apitest.cs
@@ -3306,16 +3306,16 @@
/// <returns></returns>
public string QueryPageDeviceGeneralInfo(string param)
{
- msgss<deviceGeneralInfo> msg = new msgss<deviceGeneralInfo>();
+ msgss<deviceGeneralInfoForDetail> msg = new msgss<deviceGeneralInfoForDetail>();
DeviceGeneralInfoInput page = JsonConvert.DeserializeObject<DeviceGeneralInfoInput>(param);
try
{
using (dbModel mod = new dbModel())
{
- List<deviceGeneralInfo> fiveDayDeviceInfo = null;
+ List<deviceGeneralInfoForDetail> fiveDayDeviceInfo = null;
if (page.datatime == null)
{
- fiveDayDeviceInfo = mod.deviceGeneralInfo
+ fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
.OrderByDescending(x => x.createTime)
.ToList();
}
@@ -3323,7 +3323,7 @@
{
DateTime _startTime = Convert.ToDateTime(page.datatime[0]);
DateTime _endTime = Convert.ToDateTime(page.datatime[1]);
- fiveDayDeviceInfo = mod.deviceGeneralInfo
+ fiveDayDeviceInfo = mod.deviceGeneralInfoForDetail
.Where(x => x.createTime >= _startTime && x.createTime <= _endTime)
.OrderByDescending(x => x.createTime)
.ToList();
@@ -3336,9 +3336,13 @@
//閲嶆柊璁＄畻绛夊緟鏃堕棿
item.deviceWaitTime = 1440 - ((item.deviceRunTime ?? 0M) + (item.deviceAlarmTime ?? 0M));
}
+ if (!string.IsNullOrEmpty(page.search.ext1))
+ {
+ fiveDayDeviceInfo = fiveDayDeviceInfo.Where(x => x.ext1 == page.search.ext1).ToList();
+ }
}
- List<deviceGeneralInfo> fenyeRerult = new List<deviceGeneralInfo>();
+ List<deviceGeneralInfoForDetail> fenyeRerult = new List<deviceGeneralInfoForDetail>();
if (fiveDayDeviceInfo.Count > 0)
{
msg.status = 200;
--
Gitblit v1.9.3