From 3c8e8abdd57eacc61bead8a25f9becbec0c05c4d Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Fri, 14 Aug 2026 09:52:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E4=B8=B4=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=8A=A0=E7=83=AD=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=BC=80=E8=85=94=E9=97=AE=E9=A2=98=202=E4=BF=AE=E6=94=B9DO-22?= =?UTF-8?q?0=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E8=85=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/PM/PM1/DeviceModelPM1.xml | 10 +++--- .../Config/PM/PM2/DeviceModelPM2.xml | 2 +- .../Config/TM/DeviceModelSystem.xml | 2 +- .../PMs/Routines/PMChamberMoveBodyRoutine.cs | 2 +- App/SicUI/Models/PMs/PMMotionViewModel.cs | 33 +++++++++++-------- .../Devices/IoInterLock.cs | 6 ++-- 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 9cecb52..92793b8 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -407,7 +407,7 @@ - + + --> - - - + diff --git a/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs index f4809ef..81f2bad 100644 --- a/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs @@ -126,7 +126,7 @@ namespace SicModules.PMs.Routines } if (_pm1Module._pmInterLock != null && !_pm1Module._pmInterLock.DoLidOpenRoutineSucceed && _Open) // 不限制close do-172 { - EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSucceed must be on!"); + EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSuscessed must be on!"); return Result.FAIL; } if (PmDevice.PSU2.AllHeatEnable) diff --git a/App/SicUI/Models/PMs/PMMotionViewModel.cs b/App/SicUI/Models/PMs/PMMotionViewModel.cs index 55f7e85..2a9ca66 100644 --- a/App/SicUI/Models/PMs/PMMotionViewModel.cs +++ b/App/SicUI/Models/PMs/PMMotionViewModel.cs @@ -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; } } } diff --git a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs index 14e759a..03039f5 100644 --- a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs +++ b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs @@ -376,20 +376,20 @@ namespace Aitex.Core.RT.Device.Devices //{ // if (_aiTempCtrl1.Value > 100) // { - // EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue},Reason:Interlock triggered, AI-193({Module}.AI_PSUTC) > 100"); + // EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue},Reason:Interlock triggered, AI-193({Module}.AI_PSUTC) > 100"); // return false; // } //} if (!_doLidOpenRoutineSucceed.Check(eValue, out reason)) { - EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue},Reason:" + reason); + EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue},Reason:" + reason); return false; } //if (!_doPreprocessRunning.SetValue(eValue, out reason)) if (!_doLidOpenRoutineSucceed.SetValue(eValue, out reason)) { - EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue},Reason:" + reason); + EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue},Reason:" + reason); return false; } From c3ea135a5c0eb994e537aaa82cb6b83d75d8c229 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Fri, 14 Aug 2026 13:36:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?TM=E6=B7=BB=E5=8A=A0DO37-DO42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Modules/SicModules/Config/TM/IODefinePlatform.xml | 8 ++++++-- App/SicRT/Properties/AssemblyInfo.cs | 2 +- App/SicSimulator/Config/IODefinePlatform.xml | 9 ++++++--- App/SicUI/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml index e4a433a..d07b84b 100644 --- a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml +++ b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml @@ -224,8 +224,12 @@ - - + + + + + + diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs index 4ecb3f3..0e825e1 100644 --- a/App/SicRT/Properties/AssemblyInfo.cs +++ b/App/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.1.0.60812")] +[assembly: AssemblyVersion("1.1.0.60814")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] diff --git a/App/SicSimulator/Config/IODefinePlatform.xml b/App/SicSimulator/Config/IODefinePlatform.xml index a949660..d07b84b 100644 --- a/App/SicSimulator/Config/IODefinePlatform.xml +++ b/App/SicSimulator/Config/IODefinePlatform.xml @@ -224,8 +224,12 @@ - - + + + + + + @@ -310,7 +314,6 @@ - diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs index d88a9b6..928bcf1 100644 --- a/App/SicUI/Properties/AssemblyInfo.cs +++ b/App/SicUI/Properties/AssemblyInfo.cs @@ -55,6 +55,6 @@ using System.Windows; // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.0.60812")] +[assembly: AssemblyVersion("1.1.0.60814")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")]