From c446d8da611998d7147d404e996530be43c9bc22 Mon Sep 17 00:00:00 2001 From: "SIC1016\\caipeilun" <905168240@qq.com> Date: Fri, 21 Aug 2026 16:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pump=20mfc=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9ui=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SicModules/PMs/Routines/PMPumpRoutine.cs | 5 ++-- .../PMs/Routines/PMVacIdleRoutine.cs | 5 ++-- App/SicUI/Bootstrapper.cs | 3 --- App/SicUI/Models/Maintenances/TM/TMView.xaml | 7 ------ .../Models/Maintenances/TM/TMViewModel.cs | 24 +++++++------------ App/SicUI/Models/PMs/PMOperationView.xaml | 9 +++++++ 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs index 634bc95..c571890 100644 --- a/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs @@ -29,7 +29,7 @@ namespace SicModules.PMs.Routines SetGroupK, SetGroupJ, - SetM1to16, + SetM1toM17, SetM17M18, SetPC, SetGroupI, //V87-96 @@ -200,8 +200,7 @@ namespace SicModules.PMs.Routines SetPcModeToNormal((int)RoutineStep.SetPCMode, _lstPcList); //M1-M16设定为default值(M2、M9、M15除外) - SetMfcToDefaultByGroup((int)RoutineStep.SetM1to16, MfcGroupName.M1to16, 0); - SetMfcToDefaultByGroup((int)RoutineStep.SetM17M18, MfcGroupName.M17M18, 0); + SetMfcToDefaultByGroup((int)RoutineStep.SetM1toM17, MfcGroupName.M1toM17, 0); //M2、M9、M15、M19-M40 MFC 3s ramp 到 default值 SetMfcToDefaultByGroup((int)RoutineStep.SetM2to40_1, MfcGroupName.M2toM42, 3); diff --git a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs index 0ca4c5b..d4da874 100644 --- a/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs +++ b/App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs @@ -29,7 +29,7 @@ namespace SicModules.PMs.Routines SetGroupK, SetGroupJ, - SetM1to16, + SetM1toM17, SetM17M18, SetPC, SetGroupI, //V87-96 @@ -201,8 +201,7 @@ namespace SicModules.PMs.Routines SetPcModeToNormal((int)RoutineStep.SetPCMode, _lstPcList); //M1-M16设定为default值(M2、M9、M15除外) - SetMfcToDefaultByGroup((int)RoutineStep.SetM1to16, MfcGroupName.M1to16, 0); - SetMfcToDefaultByGroup((int)RoutineStep.SetM17M18, MfcGroupName.M17M18, 0); + SetMfcToDefaultByGroup((int)RoutineStep.SetM1toM17, MfcGroupName.M1toM17, 0); //M2、M9、M15、M19-M40 MFC 3s ramp 到 default值 SetMfcToDefaultByGroup((int)RoutineStep.SetM2to40_1, MfcGroupName.M2toM42, 3); diff --git a/App/SicUI/Bootstrapper.cs b/App/SicUI/Bootstrapper.cs index c2cbca4..1861400 100644 --- a/App/SicUI/Bootstrapper.cs +++ b/App/SicUI/Bootstrapper.cs @@ -312,9 +312,6 @@ namespace SicUI.Client container.Singleton(); // 注册服务，Recipe计算器 container.Singleton("PN2"); - container.Singleton("NH3_1"); - container.Singleton("NH3_2"); - container.PerRequest(); } diff --git a/App/SicUI/Models/Maintenances/TM/TMView.xaml b/App/SicUI/Models/Maintenances/TM/TMView.xaml index b5ef1eb..449557d 100644 --- a/App/SicUI/Models/Maintenances/TM/TMView.xaml +++ b/App/SicUI/Models/Maintenances/TM/TMView.xaml @@ -2685,13 +2685,6 @@ FontSize="18" Text="PM2" Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" /> - BufferDoorState == FoupDoorState.Open ? true : false; public bool IsBufferDoorOpen => true; - public bool IsUnLoadDoorOpen => UnLoadDoorState == FoupDoorState.Open ? true : false; + public bool IsLoadLeftSlitValveOpen => LoadLeftDoorState == FoupDoorState.Open ? true : false; public bool IsPM1DoorOpen => PM1DoorState == FoupDoorState.Open ? true : false; public bool IsPM2DoorOpen => PM2DoorState == FoupDoorState.Open ? true : false; diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml index 2badf2e..7563012 100644 --- a/App/SicUI/Models/PMs/PMOperationView.xaml +++ b/App/SicUI/Models/PMs/PMOperationView.xaml @@ -2649,6 +2649,7 @@ Command="{Binding CmdTurnGasValve}" HideBlinding="True" OnOff="{Binding V39.Feedback}" + DefaultOpen="{Binding V39.DefaultValue}" Tag="V39" ValveDirection="ToBottom" ValveName="{Binding V39.DisplayName}" /> @@ -2662,6 +2663,7 @@ Command="{Binding CmdTurnGasValve}" HideBlinding="True" OnOff="{Binding V39s.Feedback}" + DefaultOpen="{Binding V39s.DefaultValue}" Tag="V39s" ValveDirection="ToBottom" ValveName="{Binding V39s.DisplayName}" /> @@ -2689,6 +2691,7 @@ HideBlinding="True" OnOff="{Binding V40s.Feedback}" Tag="V40s" + DefaultOpen="{Binding V40s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V40s.DisplayName}" /> @@ -2715,6 +2718,7 @@ HideBlinding="True" OnOff="{Binding V42.Feedback}" Tag="V42" + DefaultOpen="{Binding V42.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V42.DisplayName}" /> @@ -3024,6 +3028,7 @@ HideBlinding="True" OnOff="{Binding V53s.Feedback}" Tag="V53s" + DefaultOpen="{Binding V53s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V53s.DisplayName}" /> @@ -3150,6 +3155,7 @@ HideBlinding="True" OnOff="{Binding V54s.Feedback}" Tag="V54s" + DefaultOpen="{Binding V54s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V54s.DisplayName}" /> @@ -3262,6 +3268,7 @@ HideBlinding="True" OnOff="{Binding V56.Feedback}" Tag="V56" + DefaultOpen="{Binding V56.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V56.DisplayName}" /> @@ -3434,6 +3441,7 @@ HideBlinding="True" OnOff="{Binding V47s.Feedback}" Tag="V47s" + DefaultOpen="{Binding V47s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V47s.DisplayName}" /> @@ -3505,6 +3513,7 @@ HideBlinding="True" OnOff="{Binding V60.Feedback}" Tag="V60" + DefaultOpen="{Binding V60.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V60.DisplayName}" />