1.kepler2200 ui优化

2.PM 主界面 循环显示bug修改
3.Recipe UI界面优化

Venus/Framework/UICore/Applications/UiApplication.cs

@@ -184,11 +184,13 @@ namespace MECF.Framework.UI.Core.Applications
 						}
 					}
 				}
+                EventClient.Instance.Stop();
 
 
 
-			}
-			catch (Exception ex)
+
+            }
+            catch (Exception ex)
 			{
 				MessageBox.Show(_instance.SystemName + "Initialize failed, " + ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 				return false;

Venus/Venus_Core/ProcessUnitDefine.cs

@@ -43,15 +43,21 @@ namespace Venus_Core
     }
     public enum Kepler2300Uints
     {
-
+        PressureByPressureModeUnit,
+        TCPUnit,
+        BiasUnit,
+        GasControlUnit,
+        ProcessKitUnit
     }
     public enum Kepler2200AUnits
-    { 
-    
+    {
+        Kepler2200RFUnit,
+        Kepler2200GasControlUnit,
+        HeaterUnit
     }
     public enum Kepler2200BUnits
     {
-
+       
     }
     public partial class PressureByPressureModeUnit : ProcessUnitBase
     {
@@ -147,17 +153,18 @@ namespace Venus_Core
         public int BiasTuneCapPreset { get; set; }
         public int BiasLoadCapPreset { get; set; }
         public int BiasMaxReflectedPower { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public GeneratorMode BiasGeneratorMode { get; set; }
+        public int PulseRateFreq { get; set; }
+        public int PulseDutyCycle { get; set; }
         [IsCanConfigIgnore]
         public bool EnableRamp { get; set; }
         
         public int StartBiasRFPower { get; set; } 
         public int TargetBiasRFPower { get; set; }
-        public int BiasRFHoldTime { get; set; }
+        //public int BiasRFHoldTime { get; set; }
        
-        [JsonConverter(typeof(StringEnumConverter))]
-        public GeneratorMode BiasGeneratorMode { get; set; }
-        public int PulseRateFreq { get; set; }
-        public int PulseDutyCycle { get; set; }
+      
 
     }
 
@@ -214,9 +221,10 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "ProcessKitUnit";
 
-        [JsonConverter(typeof(StringEnumConverter))]
 
         private MovementPosition m_LiftPinPostion;
+        [JsonConverter(typeof(StringEnumConverter))]
+
         public MovementPosition LiftPinPostion
         {
             get { return m_LiftPinPostion; }

Venus/Venus_Core/Recipe.cs

@@ -596,6 +596,7 @@ namespace Venus_Core
             recipe.Header.CreateTime = DateTime.Now.ToString();
             recipe.Header.EditTime = DateTime.Now.ToString();
             recipe.Header.Type = recipeType;
+            recipe.Header.ChamberType= currentChamber;
             recipe.Header.Name = recipeName;
             recipe.Header.LastModifiedBy = "Admin";
             recipe.Steps = new ObservableCollection<RecipeStep>();
@@ -603,7 +604,6 @@ namespace Venus_Core
             switch (currentChamber)
             {
                 case JetChamber.Venus:
-                case JetChamber.Kepler2300:
                     recipe.Steps.Add(new RecipeStep()
                     {
                         StepNo = 1,
@@ -618,6 +618,20 @@ namespace Venus_Core
                  }
                     });
                     break;
+                case JetChamber.Kepler2300:
+                    recipe.Steps.Add(new RecipeStep()
+                    {
+                        StepNo = 1,
+                        LstUnit = new ObservableCollection<Object>()
+                {
+                 new PressureByPressureModeUnit(),
+                 new TCPUnit(),
+                 new BiasUnit(),
+                 new GasControlUnit(),
+                 new ProcessKitUnit()
+                 }
+                    });
+                    break;
 
                 case JetChamber.Kepler2200A:
                     recipe.Steps.Add(new RecipeStep()

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -1595,15 +1595,12 @@ namespace Venus_MainPages.ViewModels
 
             InnerTemperature = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ChillerInnerTemp"); 
             OuterTemperature = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ChillerOuterTemp"); 
-            TopTemperature = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ChillerTopTemp");
+            TopTemperature   = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ChillerTopTemp");
 
 
-            //HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
-
-
-
-            //ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
             InnerChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.InnerChiller.IsOn");
+            OuterChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.OuterChiller.IsOn");
+            TopChillerIsOn   = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TopChiller.IsOn");
 
 
             SourceRFFanInterlock = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.SourceRFFanInterlock");
@@ -1750,6 +1747,9 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.GasBoxPressureSW.Value");
 
             m_RtDataKeys.Add($"{ModuleName}.InnerChiller.IsOn");
+            m_RtDataKeys.Add($"{ModuleName}.OuterChiller.IsOn");
+            m_RtDataKeys.Add($"{ModuleName}.TopChiller.IsOn");
+
 
 
             m_RtDataKeys.Add($"{ModuleName}.ValveHeater.DeviceData");

Venus/Venus_MainPages/ViewModels/RecipeViewModel.cs

@@ -1,4 +1,5 @@
-using Aitex.Core.Common.DeviceData;
+using Aitex.Core.Account;
+using Aitex.Core.Common.DeviceData;
 using Aitex.Core.RT.IOCore;
 using Aitex.Core.RT.Log;
 using Aitex.Core.UI.View.Common;
@@ -72,7 +73,6 @@ namespace Venus_MainPages.ViewModels
         private EPDType currentEPDType=EPDType.None;
         private JetChamber currentChamber;
         private bool isInstalledEPD;
-        private TextBox cycleNumberTextBox;
         #endregion
 
         #region  属性
@@ -120,15 +120,10 @@ namespace Venus_MainPages.ViewModels
         private DelegateCommand _DeleteStepCommand;
         public DelegateCommand DeleteStepCommand =>
             _DeleteStepCommand ?? (_DeleteStepCommand = new DelegateCommand(OnDeleteStep));
+        TreeViewFileItem selectedItem;
 
         #endregion
 
-        #region 构造函数
-        public RecipeViewModel()
-        {
-            
-        }
-        #endregion
 
         #region 命令方法
       
@@ -147,7 +142,6 @@ namespace Venus_MainPages.ViewModels
                     switch (currentChamber)
                     {
                         case JetChamber.Venus:
-                        case JetChamber.Kepler2300:
                             recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
                             recipeStep.LstUnit.Add(new TCPUnit());
                             recipeStep.LstUnit.Add(new BiasUnit());
@@ -155,6 +149,13 @@ namespace Venus_MainPages.ViewModels
                             recipeStep.LstUnit.Add(new ESCHVUnit());
                             recipeStep.LstUnit.Add(new ProcessKitUnit());
                             break;
+                        case JetChamber.Kepler2300:
+                            recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
+                            recipeStep.LstUnit.Add(new TCPUnit());
+                            recipeStep.LstUnit.Add(new BiasUnit());
+                            recipeStep.LstUnit.Add(new GasControlUnit());
+                            recipeStep.LstUnit.Add(new ProcessKitUnit());
+                            break;
 
                         case JetChamber.Kepler2200A:
                             recipeStep.LstUnit.Add(new Kepler2200GasControlUnit());
@@ -244,12 +245,6 @@ namespace Venus_MainPages.ViewModels
             }
         }
 
-        //private void Timer_Tick(object sender, EventArgs e)
-        //{
-            
-        //}
-
-        TreeViewFileItem selectedItem;
         private void TreeViewRcpList_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
             selectedItem = e.NewValue as TreeViewFileItem;
@@ -718,7 +713,6 @@ namespace Venus_MainPages.ViewModels
                 switch (currentChamber)
                 {
                     case JetChamber.Venus:
-                    case JetChamber.Kepler2300:
                         recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
                         recipeStep.LstUnit.Add(new TCPUnit());
                         recipeStep.LstUnit.Add(new BiasUnit());
@@ -726,6 +720,13 @@ namespace Venus_MainPages.ViewModels
                         recipeStep.LstUnit.Add(new ESCHVUnit());
                         recipeStep.LstUnit.Add(new ProcessKitUnit());
                         break;
+                    case JetChamber.Kepler2300:
+                        recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
+                        recipeStep.LstUnit.Add(new TCPUnit());
+                        recipeStep.LstUnit.Add(new BiasUnit());
+                        recipeStep.LstUnit.Add(new GasControlUnit());
+                        recipeStep.LstUnit.Add(new ProcessKitUnit());
+                        break;
 
                     case JetChamber.Kepler2200A:
                         recipeStep.LstUnit.Add(new Kepler2200GasControlUnit());
@@ -806,15 +807,16 @@ namespace Venus_MainPages.ViewModels
                     string propertyTypeName = propertyInfo.PropertyType.Name;
                     if (propertyInfoName != "LstUnit")
                     {
+                        if ((propertyInfoName == "EPDConfig" || propertyInfoName == "MinEndPointTime" || propertyInfoName == "MaxEndPointTime") && isInstalledEPD == false)
+                        {
+                            continue;
+
+                        }
                         if (index == 0 && grid.ColumnDefinitions.Count == 1)
                         {
                            
                             RowDefinition row1 = new RowDefinition();
-                            if ((propertyInfoName == "EPDConfig" || propertyInfoName == "MinEndPointTime" || propertyInfoName == "MaxEndPointTime") && isInstalledEPD == false)
-                            {
-                                row1.Height = new GridLength(0);
-                                
-                            }
+                            
                             grid.RowDefinitions.Add(row1);
                         }
 
@@ -838,8 +840,7 @@ namespace Venus_MainPages.ViewModels
                                 UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged    //触发器
                             };
                             switch (propertyTypeName)
-                            {
-                             
+                            {                         
                                 case "Int32":
                                 case "String":
                                     if (propertyInfoName == "EPDConfig")
@@ -855,7 +856,7 @@ namespace Venus_MainPages.ViewModels
                                             grid.Children.Add(EPDcomboBox);
                                             Grid.SetRow(EPDcomboBox, i);
                                             Grid.SetColumn(EPDcomboBox, index + location);
-                                            EPDcomboBox.DropDownOpened += EPDcomboBox_DropDownOpened;
+                                            //EPDcomboBox.DropDownOpened += EPDcomboBox_DropDownOpened;
                                         }
                                         else if (currentEPDType == EPDType.WCF)
                                         {
@@ -876,19 +877,6 @@ namespace Venus_MainPages.ViewModels
                                     }
                                    
                                     TextBox textBox = new TextBox();
-                                    if (propertyInfoName == "CycleNumber")
-                                    {
-                                        if (index + location == 1)
-                                        {
-                                            cycleNumberTextBox = textBox;
-                                            Grid.SetColumnSpan(textBox, CurrentRecipe.Steps.Count);
-                                        }
-                                        else
-                                        {
-                                            Grid.SetColumnSpan(cycleNumberTextBox, CurrentRecipe.Steps.Count);
-                                            break;
-                                        }
-                                    }
                                     textBox.HorizontalContentAlignment = HorizontalAlignment.Center;
                                     textBox.VerticalContentAlignment   = VerticalAlignment.Center;
                                     //if (stepcheckbinding == null)
@@ -998,17 +986,59 @@ namespace Venus_MainPages.ViewModels
                 }
 
                 int k = 0;
-                recipeStep.LstUnit.ToList().ForEach(x =>
+                foreach (var x in recipeStep.LstUnit.ToList())
                 {
                     Type unitType = x.GetType();
-                   
+                    bool isIgnore = false;
+                    switch (currentChamber)
+                    {
 
+                        case JetChamber.Venus:
+                            var VenusUnitsValues = Enum.GetValues(typeof(VenusUnits));
+                            foreach (var item in VenusUnitsValues)
+                            {
+                                if (item.ToString() == unitType.Name)
+                                {
+                                    isIgnore = true;
+                                    break;
+                                }
+                            }
+                            break;
+                        case JetChamber.Kepler2300:
+                            var Kepler2300UintsValues = Enum.GetValues(typeof(Kepler2300Uints));
+                            foreach (var item in Kepler2300UintsValues)
+                            {
+                                if (item.ToString() == unitType.Name)
+                                {
+                                    isIgnore = true;
+                                    break;
+                                }
+                            }
+                            break;
+                        case JetChamber.Kepler2200A:
+                            var Kepler2200AUintsValues = Enum.GetValues(typeof(Kepler2200AUnits));
+                            foreach (var item in Kepler2200AUintsValues)
+                            {
+                                if (item.ToString() == unitType.Name)
+                                {
+                                    isIgnore = true;
+                                    break;
+                                }
+                            }
+                            break;
+                        case JetChamber.Kepler2200B:
+                            break;
+                    }
+                    if (!isIgnore)
+                    {
+                        continue;
+                    }
                     Binding checkbinding = null;
                     foreach (PropertyInfo propertyInfo in unitType.GetProperties())
                     {
                         object[] IgnoreAttrs = propertyInfo.GetCustomAttributes(typeof(IsCanConfigIgnore), true);
-                        bool IsEnableRecipeExtension= Convert.ToBoolean( QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.IsEnableRecipeExtension"));
-                        if (IgnoreAttrs.Length > 0 && IsEnableRecipeExtension==false)
+                        bool IsEnableRecipeExtension = Convert.ToBoolean(QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.IsEnableRecipeExtension"));
+                        if (IgnoreAttrs.Length > 0 && IsEnableRecipeExtension == false)
                         {
                             break;
                         }
@@ -1018,10 +1048,10 @@ namespace Venus_MainPages.ViewModels
                             RowDefinition row1 = new RowDefinition();
                             grid.RowDefinitions.Add(row1);
                         }
-                       
+
                         if (grid.ColumnDefinitions.Count == 1 && j == 0)
                         {
-                           
+
 
                             TextBox textBlock = new TextBox();
                             textBlock.IsReadOnly = true;
@@ -1100,7 +1130,7 @@ namespace Venus_MainPages.ViewModels
                             {
                                 TextBox textBlock1 = new TextBox();
                                 textBlock1.HorizontalContentAlignment = HorizontalAlignment.Center;
-                                textBlock1.VerticalContentAlignment =VerticalAlignment.Center;
+                                textBlock1.VerticalContentAlignment = VerticalAlignment.Center;
 
                                 textBlock1.Text = propertyInfo.GetValue(x).ToString();
                                 textBlock1.IsReadOnly = true;
@@ -1142,29 +1172,33 @@ namespace Venus_MainPages.ViewModels
                                                 break;
                                             case "Gas3":
                                                 var data3 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas3");
-                                                
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data3.Scale);
+
                                                 break;
                                             case "Gas4":
                                                 var data4 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas4");
-                                               
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data4.Scale);
+
                                                 break;
                                             case "Gas5":
                                                 var data5 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas5");
-                                                
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data5.Scale);
+
                                                 break;
                                             case "Gas6":
                                                 var data6 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas6");
-                                               
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data6.Scale);
                                                 break;
                                             case "Gas7":
                                                 var data7 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas7");
-                                               
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data7.Scale);
+
                                                 break;
                                             case "Gas8":
                                                 var data8 = (AITMfcData)QueryDataClient.Instance.Service.GetData($"{ModuleName}.MfcGas8");
-                                               
+                                                TextBoxMaxValue.SetMaxValue(textBox, (int)data8.Scale);
                                                 break;
-                                           
+
 
                                         }
                                         textBox.SetBinding(TextBox.TextProperty, binding);
@@ -1214,7 +1248,7 @@ namespace Venus_MainPages.ViewModels
                                         {
                                             comboBox.SetBinding(TextBox.IsEnabledProperty, checkbinding);
                                         }
-                                        
+
                                         comboBox.Background = Brushes.White;
                                         string path = propertyInfo.Name;
                                         comboBox.SetBinding(ComboBox.SelectedItemProperty, binding);
@@ -1229,17 +1263,21 @@ namespace Venus_MainPages.ViewModels
                         i++;
                     }
                     k++;
-                });
+                }
+                //recipeStep.LstUnit.ToList().ForEach(x =>
+                //{
+                   
+                //});
                 //index++;
             }
 
 
 
         }
-        private void EPDcomboBox_DropDownOpened(object sender, EventArgs e)
-        {
+        //private void EPDcomboBox_DropDownOpened(object sender, EventArgs e)
+        //{
            
-        }
+        //}
 
         private void EPDButton_Click(object sender, RoutedEventArgs e)
         {
@@ -1327,7 +1365,6 @@ namespace Venus_MainPages.ViewModels
                     switch (currentChamber)
                     {
                         case JetChamber.Venus:
-                        case JetChamber.Kepler2300:
                             recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
                             recipeStep.LstUnit.Add(new TCPUnit());
                             recipeStep.LstUnit.Add(new BiasUnit());
@@ -1335,10 +1372,16 @@ namespace Venus_MainPages.ViewModels
                             recipeStep.LstUnit.Add(new ESCHVUnit());
                             recipeStep.LstUnit.Add(new ProcessKitUnit());
                             break;
+                        case JetChamber.Kepler2300:
+                            recipeStep.LstUnit.Add(new PressureByPressureModeUnit());
+                            recipeStep.LstUnit.Add(new TCPUnit());
+                            recipeStep.LstUnit.Add(new BiasUnit());
+                            recipeStep.LstUnit.Add(new GasControlUnit());
+                            recipeStep.LstUnit.Add(new ProcessKitUnit());
+                            break;
 
                         case JetChamber.Kepler2200A:
                             recipeStep.LstUnit.Add(new Kepler2200GasControlUnit());
-
                             recipeStep.LstUnit.Add(new HeaterUnit());
                             recipeStep.LstUnit.Add(new Kepler2200RFUnit());
 
@@ -1368,13 +1411,14 @@ namespace Venus_MainPages.ViewModels
         {
             if (CurrentRecipe != null && CurrentRecipe.Steps.Count > 1)
             {
-                CurrentRecipe.Steps.RemoveAt(index);
                 currentRecipeGrid.Children.RemoveRange(currentRecipeGrid.RowDefinitions.Count * (index + 1), currentRecipeGrid.RowDefinitions.Count);
                 currentRecipeGrid.ColumnDefinitions.RemoveAt(index);
                 for (int i = 1; i <= CurrentRecipe.Steps.Count; i++)
                 {
                     CurrentRecipe.Steps[i - 1].StepNo = i;
                 }
+                CurrentRecipe.Steps.RemoveAt(index);
+
             }
         }
         #endregion

Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -248,7 +248,7 @@
 
 
             <!--O2-->
-            <ctrls:FlowPipe  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="507" IsFlowing="{Binding MFC6ValveIsOpen}"/>
+            <ctrls:FlowPipe  Height="8"  Width="415" Canvas.Left="65"  Canvas.Top="507" IsFlowing="{Binding MFC6ValveIsOpen}"/>
             <TextBlock Text="V6" Canvas.Left="438" Canvas.Top="485"/>
             <customControls:CommonValveControl Status="{Binding MFC6ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="501" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="16" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
@@ -375,7 +375,7 @@
                     </MultiBinding>
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
-            <ctrls:FlowPipe  Height="8"  Width="52" Canvas.Left="490" Canvas.Top="456" RotateTransformValue="90" IsReverse="True">
+            <ctrls:FlowPipe  Height="8"  Width="50" Canvas.Left="490" Canvas.Top="456" RotateTransformValue="90" IsReverse="True">
                 <ctrls:FlowPipe.IsFlowing>
                     <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                         <Binding Path="MFC6ValveIsOpen"/>
@@ -807,6 +807,7 @@
                        IsHasWafer="{Binding IsHasWafer}"
                        WaferID="{Binding WaferID}"
                        ModuleName="{Binding ModuleName}"
+                       IsHasHeater="True"
                         />
 
             <!--<Ellipse Width="20" Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466" Stroke="Silver" StrokeThickness="2"/>

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -607,16 +607,9 @@
             <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="604" Canvas.Left="1066" Status="{Binding PVHe3ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="30" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
             <TextBlock Text="VHe3" Canvas.Top="588" Canvas.Left="1060"/>
 
-            <!--<Viewbox Stretch="Uniform" Width="60" Height="50"  Canvas.Top="578" Canvas.Left="1078">
-                <Canvas  LayoutTransform="Identity" Width="999" Height="997">
-                    <Polyline Points="640,272 327,272" Stroke="#FF000000" StrokeThickness="15" />
-                    <Polygon Points="358,451 642,970 359,970 640,451 358,451" Fill="#FF00FFFF" Stroke="#FF000000" StrokeThickness="3" />
-                    <Polyline Points="499,272 499,451" Stroke="#FF000000" StrokeThickness="15" />
-                </Canvas>
-            </Viewbox>-->
             <ctrls:ZhenValve Width="34" Height="34" Canvas.Top="585.5" Canvas.Left="1095"/>
             <ctrls:FlowPipe   Height="8"  Width="17"  Canvas.Left="1055"  Canvas.Top="659" RotateTransformValue="90" IsFlowing="{Binding PVHe2ValveIsOpen}"/>
-            <ctrls:FlowPipe   Height="8"  Width="82" Canvas.Left="1058"  Canvas.Top="680" IsFlowing="{Binding PVHe2ValveIsOpen}"/>
+            <ctrls:FlowPipe   Height="8"  Width="84" Canvas.Left="1058"  Canvas.Top="680" IsFlowing="{Binding PVHe2ValveIsOpen}"/>
             <ctrls:FlowPipe   Height="8"  Width="120" Canvas.Left="1140"  Canvas.Top="680" >
                 <ctrls:FlowPipe.IsFlowing>
                     <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">

Venus/Venus_RT/App.config

@@ -13,7 +13,7 @@
 			<datePattern value="yyyyMMdd'.txt'" />
 			<layout type="log4net.Layout.PatternLayout,log4net">
 				<param name="ConversionPattern" value="%d%8p %m%n" />
-				<param name="Header" value="&#xA;----------------------开启Venus--------------------------&#xA;" />
+				<param name="Header" value="&#xA;----------------------开启RT--------------------------&#xA;" />
 			</layout>
 		</appender>
 		<root>

Venus/Venus_RT/Devices/CometRF.cs

@@ -950,7 +950,7 @@ namespace Venus_RT.Devices
             }
             else
             {
-                LOG.Write(eEvent.ERR_RF, Module, $"SetPulseRateFreq() parameter error: {nFreq}");
+                LOG.Write(eEvent.ERR_RF, Module, $"{Name},SetPulseRateFreq() parameter error: {nFreq}");
             }
             
         }
@@ -963,7 +963,7 @@ namespace Venus_RT.Devices
             }
             else
             {
-                LOG.Write(eEvent.ERR_RF, Module, $"SetPulseDutyCycle() parameter error: {percentage}");
+                LOG.Write(eEvent.ERR_RF, Module, $"{Name},SetPulseDutyCycle() parameter error: {percentage}");
             }
         }
 

Venus/Venus_RT/Devices/SMCChiller.cs

@@ -282,15 +282,15 @@ namespace Venus_RT.Devices
         public override bool Initialize()
         {
             base.Initialize();
-            if (Module == "PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller"))
-            {
-                OP.Subscribe($"{Module}.{RtOperation.SetPMBChillerState}", (function, args) =>
-                {
-                    StatusSMC = Convert.ToBoolean(args[0]) ? SMCChillerState.ON : SMCChillerState.OFF;
-                    return true;
-                });
-                return true;
-            }
+            //if (Module == "PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller"))
+            //{
+            //    OP.Subscribe($"{Module}.{RtOperation.SetPMBChillerState}", (function, args) =>
+            //    {
+            //        StatusSMC = Convert.ToBoolean(args[0]) ? SMCChillerState.ON : SMCChillerState.OFF;
+            //        return true;
+            //    });
+            //    return true;
+            //}
             SetAlarmMsg();
 
             if (!_serial.Open())
@@ -407,8 +407,8 @@ namespace Venus_RT.Devices
         {
             try
             {
-                if (Module=="PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller")) 
-                    return;
+                //if (Module=="PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller")) 
+                //    return;
                 if (_timerQueryStatus.IsTimeout() && this.StatusSMC != SMCChillerState.ERROR)
                 {
                     this.SendCmd(SMCChillerMessage.GET_ALL);
@@ -461,7 +461,7 @@ namespace Venus_RT.Devices
 
         private void SendCmd(string str)
         {
-            if (Module == "PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller")) return;
+            //if (Module == "PMB" && SC.GetValue<bool>($"PMB.Chiller.ChillerSameWithPMA") && SC.GetValue<bool>($"PMB.Chiller.EnableChiller")) return;
             //消息通用格式：开头 + 内容 + LRC + 结尾
             //_serial?.Write(":" + str + ModbusUtility.CalculateLrc(ModbusUtility.HexToBytes(str)).ToString("X2") + "\r\n");
             blockingCollection.Add(":" + str + ModbusUtility.CalculateLrc(ModbusUtility.HexToBytes(str)).ToString("X2") + "\r\n");

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -161,7 +161,7 @@ namespace Venus_RT.Modules.PMs
             }
 
             _recipeRunningMode = SC.GetValue<int>($"{Module}.RecipeRunningMode");
-
+            _processHelper.m_RecipeHead = recipe.Header;
             switch (recipe.Header.Type)
             {
                 case RecipeType.Process:
@@ -177,7 +177,7 @@ namespace Venus_RT.Modules.PMs
                     }
 
                     ProcessRecipeHead = recipe.Header;
-                    _processHelper.m_RecipeHead = ProcessRecipeHead;
+                   
                     ProcessRecipeName = recipeName;
                     _qeRecipes.Enqueue(recipe);
 
@@ -273,11 +273,9 @@ namespace Venus_RT.Modules.PMs
 
         private bool PrepareTemp()
         {
-            currentRecipeResult.RecipeCurrentCounter = 1;
 
             if (_jetChamber == JetChamber.Venus)
             {
-                //2023/08/17注释，kepler2300变三个chiller
                 return SetCoolantTemp(ChillerTemp, _OffsetTemp);
             }
             else
@@ -316,6 +314,7 @@ namespace Venus_RT.Modules.PMs
                     _loopCounter = _currentRecipe.Steps[_currentStep].CycleNumber-1;
 
                     currentRecipeResult.RecipeAllCounters = _currentRecipe.Steps[_currentStep].CycleNumber;
+                    currentRecipeResult.RecipeCurrentCounter = _loopCounter == 0 ? 0 : 1;
                 }
             }
 

Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -173,8 +173,8 @@ namespace Venus_RT.Modules.PMs
                 Chamber.GeneratorSetpower(0);
                 Chamber.GeneratorPowerOn(false);
             }
-
             Chamber.SetMatchPosition(ProcessUnit.TuneCapPreset, ProcessUnit.LoadCapPreset);
+
             return RState.Running;
         }
 

Venus/Venus_Themes/UserControls/Chamber.xaml

@@ -285,15 +285,7 @@
                     <Rectangle Stroke="{DynamicResource Lid_BD}" Fill="{DynamicResource Lid_BG3}" StrokeThickness="1" VerticalAlignment="Bottom" Height="8" Margin="5,0" Width="64" />
                     <Rectangle  HorizontalAlignment="Center" Margin="-100,0"  Width="{Binding WaferLength}" Height="10" VerticalAlignment="Top"/>
                     <TextBlock Text="{Binding  ElementName=chamber,Path=WaferID}" Margin="0,-20,0,0" TextAlignment="Center"></TextBlock>
-                    <!--<Ellipse    Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}"  
-                     Width = "70"     Height = "30"    Stroke="DarkGray"   StrokeThickness="1" Margin="0,0,0,20">
-                        <Ellipse.Fill>
-                            <RadialGradientBrush>
-                                <GradientStop Offset = "0" Color = "AliceBlue"/>
-                                <GradientStop Offset = "1" Color = "LightBlue"/>
-                            </RadialGradientBrush>
-                        </Ellipse.Fill>
-                    </Ellipse>-->
+
                     <Border BorderThickness="1" BorderBrush="DarkGray" CornerRadius="4" VerticalAlignment="Top"  Height="10" Margin="0,0,0,0" Width="140" Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}">
                         <Border.Background>
                             <RadialGradientBrush >
@@ -304,8 +296,15 @@
                             </RadialGradientBrush>
                         </Border.Background>
                     </Border>
+
                 </Grid>
 
+                <Canvas Visibility="{Binding ElementName=chamber,Path=IsHasHeater,Converter={StaticResource bool2VisibilityConverter}}" Margin="29.5,100,0,0">
+                    <Rectangle HorizontalAlignment="Left" Fill="{DynamicResource Lid_BG3}" Stroke="Black" Width="100" Height="10"/>
+                    <Rectangle HorizontalAlignment="Left" Fill="{DynamicResource Lid_BG3}" Stroke="Black" Width="100" Height="10"  Canvas.Top="10"/>
+                    <Rectangle HorizontalAlignment="Left" Fill="{DynamicResource Lid_BG3}" Stroke="Black" Width="30"  Height="30"  Canvas.Top="20" Canvas.Left="36"/>
+                </Canvas>
+
                 <!--左边slit door-->
                 <Grid x:Name="Slit_valve" Margin="-41,-10,191,29" >
                     <Rectangle x:Name="SlitValve_Top"  Fill="DimGray" Width="8" VerticalAlignment="Top" Height="75"   />

Venus/Venus_Themes/UserControls/Chamber.xaml.cs

@@ -102,7 +102,14 @@ namespace Venus_Themes.UserControls
                 this.SetValue(ModuleNameProperty, value);
             }
         }
-
+        public static readonly DependencyProperty IsHasHeaterProperty = DependencyProperty.Register(
+         "IsHasHeater", typeof(bool), typeof(Chamber),
+         new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
+        public bool IsHasHeater
+        {
+            get { return (bool)this.GetValue(IsHasHeaterProperty); }
+            set { this.SetValue(IsHasHeaterProperty, value); }
+        }
         private void CreateWafer_Click(object sender, RoutedEventArgs e)
         {
             UIEvents.OnChamberCreateDeleteWafer(new WaferOperation() { ModuleName = ModuleName, IsCreate = true });

Venus/Venus_UI/Config/UIMenu.json

@@ -91,7 +91,7 @@
         "Id": "RFCalibration",
         "Name": "RF Calibration",
         "View": "RFCalibrationView",
-        "IsShow": "true"
+        "IsShow": "false"
       }
 
     ]