1.主界面添加LLA/LLB ATM/VAV显示

2.解决kepler2300不能run recipe bug

Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -644,6 +644,7 @@ namespace Venus_MainPages.ViewModels
             {
                 LLAModuleInfo = ModuleManager.ModuleInfos["LLA"];
                 LLAWafer = ModuleManager.ModuleInfos["LLA"].WaferManager.Wafers.FirstOrDefault(x => x.WaferStatus != 0);
+
             }
             if (LLBIsInstalled == true)
             {
@@ -1044,10 +1045,17 @@ namespace Venus_MainPages.ViewModels
             if (LLAIsInstalled == true)
             {
                 m_RtDataKeys.Add("LLA.IsOnline");
+                m_RtDataKeys.Add($"TM.LLAPressureGauge.Value");
+                m_RtDataKeys.Add($"TM.LLAVacSwitch.Value");
+                m_RtDataKeys.Add($"TM.LLAATMSwitch.Value");
+
             }
             if (LLBIsInstalled == true)
             {
                 m_RtDataKeys.Add("LLB.IsOnline");
+                m_RtDataKeys.Add($"TM.LLBPressureGauge.Value");
+                m_RtDataKeys.Add($"TM.LLBVacSwitch.Value");
+                m_RtDataKeys.Add($"TM.LLBATMSwitch.Value");
             }
             if (EFEMIsInstalled == true)
             {

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -1640,7 +1640,7 @@ namespace Venus_MainPages.ViewModels
                 CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
                 if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeStepNumber != currentRecipeNumber)
                 {
-                    var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes","Process", ModuleName, CurrentRecipeResult.RecipeName + ".rcp");
+                    var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName, CurrentRecipe.Header.Type.ToString(), CurrentRecipeResult.RecipeName + ".rcp");
                     CurrentRecipe = Recipe.Load(File.ReadAllText(recipePath));
                     CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32(CurrentRecipeResult.RecipeStepNumber) - 1];
                 }

Venus/Venus_MainPages/ViewModels/OverVenusViewModel.cs

@@ -1630,7 +1630,7 @@ namespace Venus_MainPages.ViewModels
                     CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
                     if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeStepNumber != currentRecipeNumber)
                     {
-                        var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName, CurrentRecipeResult.RecipeName + ".rcp");
+                        var recipePath = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName,CurrentRecipe.Header.Type.ToString(), CurrentRecipeResult.RecipeName + ".rcp");
                         CurrentRecipe = Recipe.Load(File.ReadAllText(recipePath));
                         CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32(CurrentRecipeResult.RecipeStepNumber) - 1];
                     }

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -29,6 +29,7 @@
         <converters:BoolToVisibility2 x:Key="boolToVisibility2"/>
         <converters:BoolToBool x:Key="BoolToBool"/>
         <converters2:IsOnlineToOpacityConverter x:Key="IsOnlineToOpacityConverter"/>
+        <converters:BoolToColor  x:Key="boolToColor"/>
     </UserControl.Resources>
     <Canvas>
         <Canvas Canvas.Left="180">
@@ -532,5 +533,18 @@
             </Border>
         </Grid>
 
+        <userControls:TextboxWithLabel  Canvas.Left="710" Canvas.Top="425" LabelValue="CM4(mTorr)" TextBoxValue="{Binding RtDataValues[TM.LLBPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+        <Ellipse Width="15" Height="15"  Canvas.Left="790" Canvas.Top="426" Fill="{Binding RtDataValues[TM.LLBATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+        <Ellipse Width="15" Height="15"  Canvas.Left="790" Canvas.Top="446" Fill="{Binding RtDataValues[TM.LLBVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+        <TextBlock Text="ATM" Canvas.Left="810" Canvas.Top="426"/>
+        <TextBlock Text="VAC" Canvas.Left="810" Canvas.Top="446"/>
+        
+        <userControls:TextboxWithLabel  Canvas.Left="356" Canvas.Top="425" LabelValue="CM5(mTorr)" TextBoxValue="{Binding RtDataValues[TM.LLAPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+        <Ellipse Width="15" Height="15"  Canvas.Left="330" Canvas.Top="426" Fill="{Binding RtDataValues[TM.LLAATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+        <Ellipse Width="15" Height="15"  Canvas.Left="330" Canvas.Top="446" Fill="{Binding RtDataValues[TM.LLAVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+        <TextBlock Text="ATM" Canvas.Left="300" Canvas.Top="426"/>
+        <TextBlock Text="VAC" Canvas.Left="300" Canvas.Top="446"/>
+
+       
     </Canvas>
 </UserControl>