From 5554eb493531e78f19a68b5c40b32d143a5c6c5a Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Thu, 20 Aug 2026 14:55:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=83=AD=E4=BB=BF?=
 =?UTF-8?q?=E7=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/SicSimulator/Instances/SimulatorSystem.cs |  6 +++
 App/SicUI/Models/PMs/PMMotionViewModel.cs     | 38 +++++++++----------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index 30da2f2..35cd337 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -1018,6 +1018,12 @@ namespace SicSimulator.Instances
             IO.DI[$"{pm}.DI_SCR2Status"].Value = IO.DO[$"{pm}.DO_SCR2Enable"].Value;
             IO.DI[$"{pm}.DI_SCR3Status"].Value = IO.DO[$"{pm}.DO_SCR3Enable"].Value;
 
+            IO.DI[$"{pm}.DI_PSUEnableFB"].Value = IO.DO[$"{pm}.DO_HeaterEnable"].Value;
+
+            IO.DI[$"{pm}.DI_InnerHeaterEnableFB"].Value = IO.DO[$"{pm}.DO_PSU1Enable"].Value;
+            IO.DI[$"{pm}.DI_MiddleHeaterEnableFB"].Value = IO.DO[$"{pm}.DO_PSU2Enable"].Value;
+            IO.DI[$"{pm}.DI_OuterHeaterEnableFB"].Value = IO.DO[$"{pm}.DO_PSU3Enable"].Value;
+
             //IO.AI[$"{pm}.AI_PresentLoop1Temp"].Value = IO.AO[$"{pm}.AO_SetpointLoop1Temp"].Value;
             //IO.AI[$"{pm}.AI_Loop1ControlMode"].Value = IO.AO[$"{pm}.AO_Loop1ControlMode"].Value;
             //IO.AI[$"{pm}.AI_Loop1ActualPower"].Value = IO.AO[$"{pm}.AO_Loop1ManualOP"].Value;
diff --git a/App/SicUI/Models/PMs/PMMotionViewModel.cs b/App/SicUI/Models/PMs/PMMotionViewModel.cs
index 2a9ca66..c764bb4 100644
--- a/App/SicUI/Models/PMs/PMMotionViewModel.cs
+++ b/App/SicUI/Models/PMs/PMMotionViewModel.cs
@@ -566,26 +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;
-            return true;
+            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;
+            //return true;
         }
     }
 }