Browse Source

修复小标题efem online/offline报警bug

lixiang 1 year ago
parent
commit
f62e761ad2

+ 1 - 1
Venus/Venus_MainPages/Views/TopView.xaml

@@ -46,7 +46,7 @@
 
 
             </Grid.ColumnDefinitions>
-            <userControls:StateTitle Title="System"                 TextBoxValue="{Binding RtDataValues[SYSTEM.FsmState]}" TextBoxColor="{Binding RtDataValues[SYSTEM.FsmState],Converter={StaticResource SystemStateConverter}}" LabelColor="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource IsOnlineConverter}}" IsOnline="{Binding RtDataValues[System.IsOnline]}" IsNeedInclude="False"/>
+            <userControls:StateTitle Title="System"                 TextBoxValue="{Binding RtDataValues[SYSTEM.FsmState]}" TextBoxColor="{Binding RtDataValues[SYSTEM.FsmState],Converter={StaticResource SystemStateConverter}}" LabelColor="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource IsOnlineConverter}}" IsOnline="{Binding RtDataValues[System.IsAutoMode]}" IsNeedInclude="False"/>
 
             <userControls:StateTitle Title="VCE1"  Grid.Column="3"  TextBoxValue="{Binding RtDataValues[VCE1.FsmState]}"   TextBoxColor="{Binding RtDataValues[VCE1.FsmState],Converter={StaticResource VCEStateConverter}}" Visibility="{Binding VCE1IsInstalled,Converter={StaticResource bool2VisibilityConverter}}" IsNeedInclude="False"/>
 

+ 1 - 1
Venus/Venus_RT/App.config

@@ -28,7 +28,7 @@
 	<connectionStrings>
 		<add name="PostgreSQL"   connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader=true;" />
 		<!--0是other,1是Venus,2是kepler2300,3是Kepler2200,4是VenusSE,5是VenusDE-->
-		<add name="ConfigType"   connectionString="4"/>
+		<add name="ConfigType"   connectionString="3"/>
 	</connectionStrings>
 	<system.serviceModel>
 		<!--<diagnostics>

+ 1 - 1
Venus/Venus_RT/Modules/PMs/PMEntity.cs

@@ -631,7 +631,7 @@ namespace Venus_RT.Modules.PMs
             Transition(PMState.VATPerformanceTesting, FSM_MSG.TIMER, FnVATPerformanceTimeout, PMState.Idle);
             Transition(PMState.VATPerformanceTesting, MSG.Abort, FnAbortVATPerformance, PMState.Idle);
 
-            Transition(PMState.Idle, MSG.Heat, FnStartHeat, PMState.Heating);
+            //Transition(PMState.Idle, MSG.Heat, FnStartHeat, PMState.Heating);
             AnyStateTransition(FSM_MSG.TIMER, FnControlPressure, FSM_STATE.SAME);
             Running = true;
 

+ 6 - 3
Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -535,7 +535,7 @@ namespace Venus_RT.Modules.PMs
                 Chamber.FlowGas(4, ProcessUnit.Gas5);
             }
             else
-            { 
+            {
                 Chamber.FlowGas(4, 0);
             }
 
@@ -813,7 +813,7 @@ namespace Venus_RT.Modules.PMs
         private RState ESCHVUnit_Check(ProcessUnitBase unit, RecipeStep step)
         {
             var ProcessUnit = unit as ESCHVUnit;
-            if (Chamber.BackSideHeOutOfRange && step.ElapsedTime()>ProcessUnit.CheckDelay_ms)
+            if (Chamber.BackSideHeOutOfRange && step.ElapsedTime() > ProcessUnit.CheckDelay_ms)
             {
                 LOG.Write(eEvent.ERR_PROCESS, Chamber.Module, $"Step:{step.StepNo} failed, Backside Helium out of range.");
                 return RState.Failed;
@@ -876,7 +876,10 @@ namespace Venus_RT.Modules.PMs
             var ProcessUnit = unit as HeaterUnit;
             var position = (HighTemperatureHeaterPosition)Enum.Parse(typeof(HighTemperatureHeaterPosition), ProcessUnit.SuspectPosition.ToString());
             Chamber.HighTemperatureHeaterGotoPosition(position);
-            Chamber.SetHighTemperatureHeaterTemperature(ProcessUnit.HeaterTemp);
+            if (ProcessUnit.HeaterTemp > 0)
+            {
+                Chamber.SetHighTemperatureHeaterTemperature(ProcessUnit.HeaterTemp);
+            }
             Chamber.SetHighTemperatureHeaterRatio(ProcessUnit.HeaterRatio);
             return RState.Running;
         }

+ 2 - 2
Venus/Venus_UI/Config/Menu_Venus.json

@@ -3,7 +3,7 @@
     "Menus": [
       {
         "FirstMenu": "Operation",
-        "Permission": 0,
+        "Permission": 2,
         "SecondMenu": "Platform",
         "View": "PlatformView"
       },
@@ -27,7 +27,7 @@
       },
       {
         "FirstMenu": "PMA",
-        "Permission": 2,
+        "Permission": 0,
         "SecondMenu": "Gas&LeakCheck",
         "View": "GasLeakCheckView"
       },

+ 22 - 3
Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -435,14 +435,33 @@ namespace Venus_UI.Views
         }
         private void UIEvents_OnlineRaiseChangedEvent(IncludePara obj)
         {
-            if (obj.IsInclude)
+            if (obj.ModuleName == "EFEM")
             {
-                InvokeClient.Instance.Service.DoOperation($"{obj.ModuleName}.{RtOperation.Online}");
+                InvokeClient.Instance.Service.DoOperation($"{obj.ModuleName}.{RtOperation.Online}", obj.IsInclude);
+            }
+            else if (obj.ModuleName == "System")
+            {
+                if (obj.IsInclude)
+                {
+                    InvokeClient.Instance.Service.DoOperation("System.SetAutoMode");
+                }
+                else
+                {
+                    InvokeClient.Instance.Service.DoOperation("System.SetManualMode");
+                }
             }
             else
             {
-                InvokeClient.Instance.Service.DoOperation($"{obj.ModuleName}.{RtOperation.Offline}");
+                if (obj.IsInclude)
+                {
+                    InvokeClient.Instance.Service.DoOperation($"{obj.ModuleName}.{RtOperation.Online}");
+                }
+                else
+                {
+                    InvokeClient.Instance.Service.DoOperation($"{obj.ModuleName}.{RtOperation.Offline}");
+                }
             }
+           
         }
         #region 调用api功能部分
         void win_SourceInitialized(object sender, EventArgs e)