Sic-Software/MoS2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改pump mfc

Browse Source 
修改ui界面
This commit is contained in:
SIC1016\caipeilun 2026-08-21 16:59:48 +08:00
parent b335f7aaab
commit c446d8da61
6 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
View File

@ -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);

5
App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
View File

@ -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);

3
App/SicUI/Bootstrapper.cs
View File

@ -312,9 +312,6 @@ namespace SicUI.Client
container.Singleton<IRecipeGasFlowCalculator, RecipeGasFlowCalculatorBase>(); // 注册服务，Recipe计算器
container.Singleton<IRecipeGasFlowCalculator, RecipeGasFlowCalculatorBase>("PN2");
container.Singleton<IRecipeGasFlowCalculator, NH3_1GasFlow>("NH3_1");
container.Singleton<IRecipeGasFlowCalculator, NH3_2GasFlow>("NH3_2");
container.PerRequest<MainViewModel>();
}

7
App/SicUI/Models/Maintenances/TM/TMView.xaml
View File

@ -2685,13 +2685,6 @@
FontSize="18"
Text="PM2"
Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
<TextBlock
Canvas.Left="116"
Canvas.Top="235"
FontFamily="Arial"
FontSize="18"
Text="UnLoad"
Visibility="{Binding IsPreHeatInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
<TextBlock
Canvas.Left="568"
Canvas.Top="220"

24
App/SicUI/Models/Maintenances/TM/TMViewModel.cs
View File

@ -79,10 +79,6 @@ namespace SicUI.Client.Models.Platform.TM
{
return IsBufferDoorOpen;
}
else if (SlitValveSelectedModule == "UnLoad")
{
return IsUnLoadDoorOpen;
}
else if (SlitValveSelectedModule == "PM1")
{
return IsPM1DoorOpen;
@ -106,10 +102,6 @@ namespace SicUI.Client.Models.Platform.TM
{
return !IsBufferDoorOpen;
}
else if (SlitValveSelectedModule == "UnLoad")
{
return !IsUnLoadDoorOpen;
}
else if (SlitValveSelectedModule == "PM1")
{
return !IsPM1DoorOpen;
@ -136,13 +128,13 @@ namespace SicUI.Client.Models.Platform.TM
}
}
public FoupDoorState UnLoadDoorState
public FoupDoorState LoadLeftDoorState
{
get
{
{
if (UnLoadDoorOpenFeedback && !UnLoadDoorCloseFeedback) return FoupDoorState.Open;
if (!UnLoadDoorOpenFeedback && UnLoadDoorCloseFeedback) return FoupDoorState.Close;
if (LoadLeftDoorOpenFeedback && !LoadLeftDoorCloseFeedback) return FoupDoorState.Open;
if (!LoadLeftDoorOpenFeedback && LoadLeftDoorCloseFeedback) return FoupDoorState.Close;
}
return FoupDoorState.Unknown;
@ -271,11 +263,11 @@ namespace SicUI.Client.Models.Platform.TM
[Subscription("TM.LoadLockDoor.CloseFeedback")]
public bool LLDoorCloseFeedback { get; set; }
[Subscription("TM.UnLoadDoor.OpenFeedback")]
public bool UnLoadDoorOpenFeedback { get; set; }
[Subscription("LoadLock.LoadLockLSideDoor.OpenFeedback")]
public bool LoadLeftDoorOpenFeedback { get; set; }
[Subscription("TM.UnLoadDoor.CloseFeedback")]
public bool UnLoadDoorCloseFeedback { get; set; }
[Subscription("LoadLock.LoadLockLSideDoor.CloseFeedback")]
public bool LoadLeftDoorCloseFeedback { get; set; }
@ -460,7 +452,7 @@ namespace SicUI.Client.Models.Platform.TM
//public bool IsBufferDoorOpen => 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;

9
App/SicUI/Models/PMs/PMOperationView.xaml
View File

@ -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}" />