From ef0360bd1befc35cc5af197a92ce462bad3af50f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 18 9月 2025 18:30:01 +0800
Subject: [PATCH] 解决 时间格式不对的问题
---
siemenswmssditcode/wmsService/wcftest/Form1.cs | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/siemenswmssditcode/wmsService/wcftest/Form1.cs b/siemenswmssditcode/wmsService/wcftest/Form1.cs
index 92306f0..72e201d 100644
--- a/siemenswmssditcode/wmsService/wcftest/Form1.cs
+++ b/siemenswmssditcode/wmsService/wcftest/Form1.cs
@@ -3195,24 +3195,11 @@
totalInfo.list11[1] = outTaskCount.Count;
}
- //鏇存敼鏁伴噺 銆怑ditby shaocx,2024-11-22銆�
- /*
- if (stockUsingCount != null)
- {
- decimal cout = stockUsingCount.Count / 1140M * 100;
- totalInfo.list11[2] = Convert.ToInt32(cout);
- }
- if (outTimeStockCount != null)
- {
- totalInfo.list11[3] = outTimeStockCount.Count;
- }
- //*/
+
totalInfo.list11[2] = 1152;
totalInfo.list11[3] = 1152 - stockUsingCount.Count();
if (lastHour != today.Hour)
- //int aaaa = 1;
- //if (aaaa == 2)
{
//姣忛殧涓�灏忔椂淇濆瓨涓�娆¤澶囩姸鎬佹椂闂�
lastHour = today.Hour;
@@ -3232,7 +3219,7 @@
}
else
{
- //todayDeviceInfo.deviceWaitTime = deviceWaitTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceWaitTime.TotalMinutes) : 0M;// deviceWaitTime.Hours * 60M + deviceWaitTime.Minutes;
+
todayDeviceInfo.deviceRunTime = deviceRunTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceRunTime.TotalMinutes) : 0M;
todayDeviceInfo.deviceAlarmTime = deviceAlarmTime.TotalMinutes > 0 ? Convert.ToDecimal(deviceAlarmTime.TotalMinutes) : 0M;
//閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
@@ -3241,7 +3228,6 @@
todayDeviceInfo.taskEnterCount = enterTaskCount.Count;//鍏ュ簱浠诲姟鏁�
todayDeviceInfo.taskOutCount = outTaskCount.Count;//鍑哄簱浠诲姟鏁�
//鏇存敼鏁伴噺 銆怑ditby shaocx,2024-11-22銆�
- //decimal cout = stockUsingCount.Count / 1140M * 100;
decimal cout = stockUsingCount.Count / 1152M * 100;
todayDeviceInfo.stockProportion = Convert.ToInt32(cout);//宸蹭娇鐢ㄧ殑搴撲綅
todayDeviceInfo.outDate = outTimeStockCount.Count;//杩囨湡鏃堕棿灏忎簬涓�涓湀鐨勫簱瀛樻暟鎹�
@@ -3610,6 +3596,11 @@
//閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
}
+ private void CommonCalcWaitTime(ref deviceGeneralInfoForDetail todayDeviceInfo)
+ {
+ //閲嶆柊璁＄畻璁惧绛夊緟鏃堕棿 銆怑ditby shaocx,2024-12-30銆�
+ todayDeviceInfo.deviceWaitTime = 1440 - (todayDeviceInfo.deviceRunTime + todayDeviceInfo.deviceAlarmTime);
+ }
#endregion
--
Gitblit v1.9.3