修复recipe Ui信息显示

Venus/Venus_Core/RecipeResult.cs

@@ -29,6 +29,8 @@ namespace Venus_Core
         public int RecipeCurrentCounter { get; set; }
         [DataMember]
         public int RecipeAllCounters { get; set; }
+        [DataMember]
+        public string RecipeType { get; set; }
 
     }
 }

Venus/Venus_MainPages/ViewModels/OverKepler2200AViewModel.cs

@@ -1535,7 +1535,7 @@ namespace Venus_MainPages.ViewModels
             if (PMCurrentState == PMState.Processing)
             {
                 CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                if (CurrentRecipeResult.RecipeStepNumber != null)
+                if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
                 { 
                  CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32( CurrentRecipeResult.RecipeStepNumber) - 1];
                 }

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -1535,7 +1535,7 @@ namespace Venus_MainPages.ViewModels
             if (PMCurrentState == PMState.Processing)
             {
                 CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                if (CurrentRecipeResult.RecipeStepNumber != null)
+                if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
                 { 
                  CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32( CurrentRecipeResult.RecipeStepNumber) - 1];
                 }

Venus/Venus_MainPages/ViewModels/OverVenusViewModel.cs

@@ -1562,8 +1562,14 @@ namespace Venus_MainPages.ViewModels
 
                 if (PMCurrentState == PMState.Processing)
                 {
+                    //var cr= CommonFunction.GetValue<Recipe>(RtDataValues, $"{ModuleName}.CurrentRecipe");
+                    //if (cr == null) 
+                    //{
+                    //    return;
+                    //}
+
                     CurrentRecipeResult = CommonFunction.GetValue<RecipeResult>(RtDataValues, $"{ModuleName}.CurrentRecipeResult");
-                    if (CurrentRecipeResult.RecipeStepNumber != null)
+                    if (CurrentRecipeResult.RecipeStepNumber != null && CurrentRecipeResult.RecipeType == RecipeType.Process.ToString())
                     {
                         CurrentRecipeStep = CurrentRecipe.Steps[Convert.ToInt32(CurrentRecipeResult.RecipeStepNumber) - 1];
                     }
@@ -1702,8 +1708,6 @@ namespace Venus_MainPages.ViewModels
 
             m_RtDataKeys.Add($"{ModuleName}.HasWafer");
             m_RtDataKeys.Add($"{ModuleName}.CurrentRecipeResult");
-
-
         }
         #endregion
     }

Venus/Venus_RT/Modules/PMs/PMEntity.cs

@@ -604,6 +604,8 @@ namespace Venus_RT.Modules.PMs
 
 
             DATA.Subscribe($"{Module}.CurrentRecipeResult", () => _processRoutine.currentRecipeResult);
+            
+
 
 
             OP.Subscribe($"{Module}.{RtOperation.GasFlow}", (cmd, args) => CheckToPostMessage((int)MSG.GasFlow, args));

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -3,14 +3,11 @@ using System.Collections.Generic;
 using Aitex.Core.RT.Routine;
 using Aitex.Core.RT.SCCore;
 using Aitex.Core.Common;
-using Aitex.Common.Util;
 using Aitex.Core.RT.RecipeCenter;
 using Venus_RT.Devices;
 using MECF.Framework.Common.Equipment;
 using MECF.Framework.Common.SubstrateTrackings;
-
 using Venus_Core;
-using System.ServiceModel.Security.Tokens;
 using System.Diagnostics;
 using MECF.Framework.Common.DBCore;
 using Venus_RT.FAs;
@@ -38,7 +35,7 @@ namespace Venus_RT.Modules.PMs
         private readonly ProcessHelper _processHelper;
         private bool _withWafer = true;
         private bool _needPumpDown = false;
-        private Recipe _currentRecipe = null;
+        public Recipe _currentRecipe = null;
         private int _currentStep = 0;
         private Queue<Recipe> _qeRecipes = new Queue<Recipe>();
 
@@ -67,7 +64,6 @@ namespace Venus_RT.Modules.PMs
                             return setpoint;
                     }
                 }
-
                 return 0;
             }
         }
@@ -324,11 +320,11 @@ namespace Venus_RT.Modules.PMs
         }
         private bool RunRecipes()
         {     
-
             var step = _currentRecipe.Steps[_currentStep];
             currentRecipeResult.RecipeStepNumber = step.StepNo;
             currentRecipeResult.RecipeStepType=step.Type.ToString();
             currentRecipeResult.RecipeStepSetTime=step.Time;
+            currentRecipeResult.RecipeType=_currentRecipe.Header.Type.ToString();
             //currentRecipeResult.RecipeStepDuringTime = (int)_stepTime.ElapsedMilliseconds/1000;
             currentRecipeResult.RecipeStepDuringTime = new System.TimeSpan(0, 0, System.Convert.ToInt32(_stepTime.ElapsedMilliseconds/1000));
             

Venus/Venus_RT/Modules/PMs/PumpDownRoutine.cs

@@ -4,6 +4,7 @@ using Aitex.Core.RT.SCCore;
 using Venus_RT.Devices;
 using MECF.Framework.Common.Routine;
 using Venus_Core;
+
 namespace Venus_RT.Modules.PMs
 {
     class PumpDownRoutine : PMRoutineBase, IRoutine