From fc752b66a7976188c4edd5e3fb7ca6bb2822e441 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 19 9月 2025 15:11:07 +0800
Subject: [PATCH] 优化
---
siemenswmssditcode/wmsService/wcftest/BussinessExtension/DeviceGeneralInfoHelper.cs | 14 ++++++++++++++
siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/siemenswmssditcode/wmsService/wcftest/BussinessExtension/DeviceGeneralInfoHelper.cs b/siemenswmssditcode/wmsService/wcftest/BussinessExtension/DeviceGeneralInfoHelper.cs
index ac52cac..1c35f71 100644
--- a/siemenswmssditcode/wmsService/wcftest/BussinessExtension/DeviceGeneralInfoHelper.cs
+++ b/siemenswmssditcode/wmsService/wcftest/BussinessExtension/DeviceGeneralInfoHelper.cs
@@ -55,6 +55,7 @@
{
todayDeviceInfo = new deviceGeneralInfoForDetail();
todayDeviceInfo.ext1 = str_srmNo;//璧嬪�� 鏈哄彿
+ todayDeviceInfo.ext2 = GetCurrentPeriod();
todayDeviceInfo.createTime = DateTime.Now;
mod.deviceGeneralInfoForDetail.Add(todayDeviceInfo);
//璁℃椂澶嶄綅
@@ -106,6 +107,7 @@
{
deviceGeneralInfoForDetail creatTodayDeviceInfo = new deviceGeneralInfoForDetail();
creatTodayDeviceInfo.ext1 = str_srmNo;//鏈哄彿璧嬪��
+ creatTodayDeviceInfo.ext2 = GetCurrentPeriod();
//璁惧鎶ヨ鏃堕棿
creatTodayDeviceInfo.deviceAlarmTime = Convert.ToDecimal(deviceAlarmTime.Hours * 60M) + deviceAlarmTime.Minutes;//鍗曚綅鍒嗛挓
//璁惧杩愯鏃堕棿
@@ -136,5 +138,17 @@
//閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
}
+
+
+
+ public static string GetCurrentPeriod()
+ {
+ DateTime today = DateTime.Today;
+ DateTime startDate = new DateTime(today.Year, today.Month, today.Day, 0, 0, 0);
+ DateTime endDate = new DateTime(today.Year, today.Month, today.Day, 23, 59, 59);
+
+ return string.Format("{0:yyyy-MM-dd HH:mm:ss} 鑷� {1:yyyy-MM-dd HH:mm:ss}",
+ startDate, endDate);
+ }
}
}
diff --git a/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs b/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs
index 79e253a..f948256 100644
--- a/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs
+++ b/siemenswmssditcode/wmsService/wcftest/orm/deviceGeneralInfoForDetail.cs
@@ -44,6 +44,9 @@
[StringLength(50)]
public string ext1 { get; set; }
+ /// <summary>
+ /// 时间范围字符串
+ /// </summary>
[StringLength(50)]
public string ext2 { get; set; }
--
Gitblit v1.9.3