diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index d2970de..0e8dc19 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -11,7 +11,7 @@ aoPLCTargetOPLowLimit="AO_PLCTargetOPLowLimit" aoPLCTargetOPUpLimit="AO_PLCTargetOPUpLimit" doPLCTempFilterEN="DO_PLCTempFilterEN" doPLCTargetOPCtrlEN="DO_PLCTargetOPCtrlEN" /> - + + @@ -865,7 +867,8 @@ - + + @@ -885,7 +888,7 @@ - + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index e0138e9..a1b5e0c 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -426,6 +426,8 @@ + + @@ -852,7 +854,8 @@ - + + @@ -872,7 +875,7 @@ - + diff --git a/App/Modules/SicModules/PMs/RecipeExecutions/PostProcess.cs b/App/Modules/SicModules/PMs/RecipeExecutions/PostProcess.cs index 8f4813b..f3dd673 100644 --- a/App/Modules/SicModules/PMs/RecipeExecutions/PostProcess.cs +++ b/App/Modules/SicModules/PMs/RecipeExecutions/PostProcess.cs @@ -178,7 +178,7 @@ namespace SicModules.PMs.RecipeExecutions //所有PC设定为默认值 SetPcToDefault((int)RoutineStep.SetPC, _lstPcList); // M18 - M40(除 M30\M34\M39)) MFC 5s ramp 到 0。 - SetMfcByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439, 0, 5); + SetMfcToDefaultByGroup((int)RoutineStep.SetM18toM40, MfcGroupName.M18toM40No303439,3); //打开EPV2 diff --git a/App/Modules/SicModules/PMs/RecipeExecutions/PreProcess.cs b/App/Modules/SicModules/PMs/RecipeExecutions/PreProcess.cs index a13fb92..4328caf 100644 --- a/App/Modules/SicModules/PMs/RecipeExecutions/PreProcess.cs +++ b/App/Modules/SicModules/PMs/RecipeExecutions/PreProcess.cs @@ -487,6 +487,7 @@ namespace SicModules.PMs.RecipeExecutions { if (PmDevice.TC1.L2PVFeedBack >= targetTemp) { + Notify(reason); return true; } diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs index 5a5a18c..3111b69 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.60825")] +[assembly: AssemblyVersion("1.1.0.60826")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index d94e186..41bb86d 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -437,6 +437,8 @@ + + @@ -865,7 +867,8 @@ - + + @@ -885,7 +888,7 @@ - + diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml index 471ed6e..0cfd8ca 100644 --- a/App/SicUI/Models/PMs/PMOperationView.xaml +++ b/App/SicUI/Models/PMs/PMOperationView.xaml @@ -2647,9 +2647,9 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V39.DefaultValue}" HideBlinding="True" OnOff="{Binding V39.Feedback}" - DefaultOpen="{Binding V39.DefaultValue}" Tag="V39" ValveDirection="ToBottom" ValveName="{Binding V39.DisplayName}" /> @@ -2661,9 +2661,9 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V39s.DefaultValue}" HideBlinding="True" OnOff="{Binding V39s.Feedback}" - DefaultOpen="{Binding V39s.DefaultValue}" Tag="V39s" ValveDirection="ToBottom" ValveName="{Binding V39s.DisplayName}" /> @@ -2688,10 +2688,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V40s.DefaultValue}" HideBlinding="True" OnOff="{Binding V40s.Feedback}" Tag="V40s" - DefaultOpen="{Binding V40s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V40s.DisplayName}" /> @@ -2715,10 +2715,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V42.DefaultValue}" HideBlinding="True" OnOff="{Binding V42.Feedback}" Tag="V42" - DefaultOpen="{Binding V42.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V42.DisplayName}" /> @@ -3025,10 +3025,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V53s.DefaultValue}" HideBlinding="True" OnOff="{Binding V53s.Feedback}" Tag="V53s" - DefaultOpen="{Binding V53s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V53s.DisplayName}" /> @@ -3152,10 +3152,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V54s.DefaultValue}" HideBlinding="True" OnOff="{Binding V54s.Feedback}" Tag="V54s" - DefaultOpen="{Binding V54s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V54s.DisplayName}" /> @@ -3265,10 +3265,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V56.DefaultValue}" HideBlinding="True" OnOff="{Binding V56.Feedback}" Tag="V56" - DefaultOpen="{Binding V56.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V56.DisplayName}" /> @@ -3438,10 +3438,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V47s.DefaultValue}" HideBlinding="True" OnOff="{Binding V47s.Feedback}" Tag="V47s" - DefaultOpen="{Binding V47s.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V47s.DisplayName}" /> @@ -3510,10 +3510,10 @@ Width="16" Height="15" Command="{Binding CmdTurnGasValve}" + DefaultOpen="{Binding V60.DefaultValue}" HideBlinding="True" OnOff="{Binding V60.Feedback}" Tag="V60" - DefaultOpen="{Binding V60.DefaultValue}" ValveDirection="ToBottom" ValveName="{Binding V60.DisplayName}" /> diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs index bb52187..dd1b3ad 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.60825")] +[assembly: AssemblyVersion("1.1.0.60826")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")]