From 9588fe01219edd9aadb1cc1858ef2bee6afa16e9 Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Wed, 10 Jun 2026 13:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Routine=20=E4=BF=AE=E6=94=B9P?= =?UTF-8?q?C9=E7=9B=B8=E5=85=B3=E4=BB=BF=E7=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Modules/SicModules/PMs/PMModuleDevice.cs | 4 +- .../SicModules/PMs/Routines/PMCleanRoutine.cs | 4 - .../PMs/Routines/PMLeakCheckRoutine.cs | 3 - .../PMs/Routines/PMProcessAbortRoutine.cs | 2 - .../SicModules/PMs/Routines/PMPumpRoutine.cs | 2 - .../SicModules/PMs/Routines/PMPurgeRoutine.cs | 2 - .../PMs/Routines/PMToAtmIdleRoutine.cs | 2 - .../PMs/Routines/PMToIsolationRoutine.cs | 2 - .../PMs/Routines/PMToProcessIdleRoutine.cs | 3 +- .../PMs/Routines/PMVacIdleRoutine.cs | 2 - .../SicModules/PMs/Routines/PMVentRoutine.cs | 2 +- App/SicRT/Properties/AssemblyInfo.cs | 2 +- App/SicSimulator/Instances/SimulatorSystem.cs | 2 + App/SicUI/Properties/AssemblyInfo.cs | 2 +- .../CenterViews/DataLogs/Event/EventView.xaml | 297 +++++++++--------- .../Themes/SeaBlue/ComboBox.xaml | 8 +- .../Themes/SeaBlue/DataGrid.xaml | 47 +-- .../Themes/SeaBlue/Listview.xaml | 73 ++--- .../Themes/SeaBlue/TreeView.xaml | 2 +- 19 files changed, 219 insertions(+), 242 deletions(-) diff --git a/App/Modules/SicModules/PMs/PMModuleDevice.cs b/App/Modules/SicModules/PMs/PMModuleDevice.cs index 4fc759f..9c98862 100644 --- a/App/Modules/SicModules/PMs/PMModuleDevice.cs +++ b/App/Modules/SicModules/PMs/PMModuleDevice.cs @@ -522,7 +522,7 @@ namespace SicModules.PMs "Mfc31", "Mfc33", "Mfc34", "Mfc35", "Mfc36", "Mfc37", "Mfc38","Mfc31", "Mfc40", "Mfc41", "Mfc42", "Mfc43", "Mfc44", "Mfc45"}; - private List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; + private List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; public List _mfcList { @@ -1247,7 +1247,7 @@ namespace SicModules.PMs } else if (mGroupName == MfcGroupName.All) { - lst = new List() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 }; + lst = new List() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 }; } return lst; diff --git a/App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs index 64abd38..c1a5e0c 100644 --- a/App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs @@ -180,10 +180,6 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - - - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout = 20; //旋转停止超时 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs index 8be56d3..4df0458 100644 --- a/App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs @@ -198,9 +198,6 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs index 331e347..355a932 100644 --- a/App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs @@ -47,8 +47,6 @@ namespace SicModules.PMs.Routines private int _mfc1to16RampTime = 30; private int _mfc2to45RampTime = 30; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _IoValueOpenCloseTimeout = 10; private int _routineTimeOut = 10; diff --git a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs index e7aac73..466b2c0 100644 --- a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs @@ -106,8 +106,6 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 private int _IoValueOpenCloseTimeout = 10; //开关超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs index f3c7feb..b2fc7ce 100644 --- a/App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs @@ -202,8 +202,6 @@ namespace SicModules.PMs.Routines private IoInterLock _pmIoInterLock; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs index 750072b..cd57c2c 100644 --- a/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs @@ -110,8 +110,6 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 diff --git a/App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs index 51fdec0..0e4d3e4 100644 --- a/App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs @@ -91,8 +91,6 @@ namespace SicModules.PMs.Routines private PMModule _pm1Module; private IoThrottleValve2 _IoThrottle; - private List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCloseTimeout = 20; //旋转停止超时 private int _IoValueOpenCloseTimeout = 10; //开关超时时间 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs index 60ad6a7..8bbcc63 100644 --- a/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs @@ -165,8 +165,7 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - + private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 private int _IoValueOpenCloseTimeout = 10; //开关超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs index aace4aa..e0d30eb 100644 --- a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs @@ -108,8 +108,6 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; - private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 private int _IoValueOpenCloseTimeout = 10; //开关超时时间 diff --git a/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs index 344f197..742bd0c 100644 --- a/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs @@ -110,7 +110,7 @@ namespace SicModules.PMs.Routines private IoThrottleValve2 _IoThrottle; private IoInterLock _pmIoInterLock; - List _lstPcList = new List { 1, 2, 3, 4, 5, 6, 7 }; + private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCloseTimeout; //旋转停止超时 diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs index 47c2e53..e29cbe0 100644 --- a/App/SicRT/Properties/AssemblyInfo.cs +++ b/App/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.1.6.60606")] +[assembly: AssemblyVersion("1.1.7.60610")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 3212e0c..109a2c4 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -445,6 +445,8 @@ namespace SicSimulator.Instances new Tuple("AI_PressCtrl5","AO_PressCtrl5"), new Tuple("AI_PressCtrl6","AO_PressCtrl6"), new Tuple("AI_PressCtrl7","AO_PressCtrl7"), + new Tuple("AI_PressCtrl8","AO_PressCtrl8"), + new Tuple("AI_PressCtrl9","AO_PressCtrl9"), diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs index cfb36a3..15b3fb4 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.6.60606")] +[assembly: AssemblyVersion("1.1.7.60610")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] diff --git a/Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml b/Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml index b4d6bca..6d5ce5f 100644 --- a/Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml +++ b/Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml @@ -2,30 +2,29 @@ x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.Event.EventView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms" xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" + xmlns:lex="http://wpflocalizeextension.codeplex.com" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:micro="clr-namespace:Caliburn.Micro" xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core" - xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" - xmlns:lex="http://wpflocalizeextension.codeplex.com" Name="uc" d:DesignHeight="800" d:DesignWidth="1400" - mc:Ignorable="d" lex:LocalizeDictionary.DesignCulture="en" lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" - lex:ResxLocalizationProvider.DefaultDictionary="lang_common"> + lex:ResxLocalizationProvider.DefaultDictionary="lang_common" + mc:Ignorable="d"> - - +