Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

This commit is contained in:
SIC1016\caipeilun
2026-08-14 18:25:29 +08:00
10 changed files with 44 additions and 32 deletions
+19 -14
View File
@@ -566,21 +566,26 @@ namespace SicUI.Models.PMs
public Visibility HeatEnableTips { get; set; }
private bool CheckHeatConditionOK(out double minuts)
{
//minuts = 0;
//int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
//string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
//DateTime dtStartTime =DateTime.Now;
//if (DateTime.TryParse(dateTimeStr, out dtStartTime))
//{
// minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
// if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
// {
// HeatEnableTips = Visibility.Collapsed;
// return true;
// }
//}
//HeatEnableTips = Visibility.Visible;
//return false;
minuts = 0;
int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
DateTime dtStartTime =DateTime.Now;
if (DateTime.TryParse(dateTimeStr, out dtStartTime))
{
minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
{
HeatEnableTips = Visibility.Collapsed;
return true;
}
}
HeatEnableTips = Visibility.Visible;
return false;
return true;
}
}
}