1、Chamber add the waferID

2、Show the Description of the Recipe step

Venus/Venus_Core/RecipeResult.cs

@@ -20,6 +20,8 @@ namespace Venus_Core
         [DataMember]
         public string RecipeStepType { get; set;}
         [DataMember]
+        public string RecipeStepDescription { get; set; }
+        [DataMember]
         public int? RecipeStepSetTime { get; set; }
 
         [DataMember]

Venus/Venus_MainPages/ViewModels/OverKepler2200AViewModel.cs

@@ -195,7 +195,7 @@ namespace Venus_MainPages.ViewModels
 
         private double m_ChamberPressureFeedBack;
 
-
+        private string m_WaferID;
         #endregion
 
         #region  属性
@@ -871,6 +871,11 @@ namespace Venus_MainPages.ViewModels
             get { return m_ChamberPressureFeedBack; }
             set { SetProperty(ref m_ChamberPressureFeedBack, value); }
         }
+        public string WaferID
+        {
+            get { return m_WaferID; }
+            set { SetProperty(ref m_WaferID, value); }
+        }
         #endregion
 
         #region 命令
@@ -1368,7 +1373,7 @@ namespace Venus_MainPages.ViewModels
                 AITHeaterData heaterData = obj as AITHeaterData;
                 var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
 
-                heaterView = new HeaterView(heaterData,ModuleName);
+                heaterView = new HeaterView(heaterData);
                 heaterView.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 heaterView.Owner = _mainWindow;
                 heaterView.Show();          
@@ -1529,8 +1534,8 @@ namespace Venus_MainPages.ViewModels
             BiasMatchC2 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C2");
             TurboPumpWaterFlowSwitch = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TurboPumpWaterFlowSwitch.Value");
             IsTurboPumpAtSpeed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsTurboPumpAtSpeed"); 
-            IsHasWafer= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer"); 
-
+            IsHasWafer= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer");
+            WaferID = IsHasWafer ? ModuleManager.ModuleInfos[ModuleName].WaferManager.Wafers[0].SourceName : "";
 
             if (PMCurrentState == PMState.Processing)
             {

Venus/Venus_MainPages/ViewModels/OverKepler2300ViewModel.cs

@@ -19,7 +19,6 @@ using Venus_Unity;
 using MECF.Framework.Common.CommonData.DeviceData;
 using System.Windows.Shapes;
 using Path = System.IO.Path;
-using MECF.Framework.Common.Equipment;
 
 namespace Venus_MainPages.ViewModels
 {
@@ -139,23 +138,12 @@ namespace Venus_MainPages.ViewModels
         private string m_SelectedRecipe;
 
         private float m_ChillerTempSetpoint;
-
-        private float m_InnerChillerTempSetpoint;
-        private float m_OuterChillerTempSetpoint;
-        private float m_TopChillerTempSetpoint;
-
         private float m_WallTempSetpoint;
 
         private bool m_HeIsPressureMode=true;
 
         private bool m_ChillerIsOn;
 
-        private bool m_InnerChillerIsOn;
-        private bool m_OuterChillerIsOn;
-        private bool m_TopChillerIsOn;
-
-
-
         private float m_ProcessHighPressure;
         private float m_ProcessLowPressure;
         private float m_ForelinePressurePressure;
@@ -173,11 +161,6 @@ namespace Venus_MainPages.ViewModels
         private bool m_IsLidClosed;
 
         private float m_ChillerTemperature;
-
-        private float m_InnerTemperature;
-        private float m_OuterTemperature;
-        private float m_TopTemperature;
-
         //private float m_HVTemperature;
 
 
@@ -212,7 +195,7 @@ namespace Venus_MainPages.ViewModels
 
         private double m_ChamberPressureFeedBack;
 
-
+        private string m_WaferID;
         #endregion
 
         #region  属性
@@ -325,30 +308,6 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_ChillerTemperature, value);
             }
         }
-        public float InnerTemperature
-        {
-            get { return m_InnerTemperature; }
-            set
-            {
-                SetProperty(ref m_InnerTemperature, value);
-            }
-        }
-        public float OuterTemperature
-        {
-            get { return m_OuterTemperature; }
-            set
-            {
-                SetProperty(ref m_OuterTemperature, value);
-            }
-        }
-        public float TopTemperature
-        {
-            get { return m_TopTemperature; }
-            set
-            {
-                SetProperty(ref m_TopTemperature, value);
-            }
-        }
         //public float HVTemperature
         //{
         //    get { return m_HVTemperature; }
@@ -890,22 +849,6 @@ namespace Venus_MainPages.ViewModels
             set { SetProperty(ref m_ChillerTempSetpoint, value); }
         }
 
-        public float InnerChillerTempSetpoint
-        {
-            get { return m_InnerChillerTempSetpoint; }
-            set { SetProperty(ref m_InnerChillerTempSetpoint, value); }
-        }
-        public float OuterChillerTempSetpoint
-        {
-            get { return m_OuterChillerTempSetpoint; }
-            set { SetProperty(ref m_OuterChillerTempSetpoint, value); }
-        }
-        public float TopChillerTempSetpoint
-        {
-            get { return m_TopChillerTempSetpoint; }
-            set { SetProperty(ref m_TopChillerTempSetpoint, value); }
-        }
-
         public float WallTempSetpoint
         {
             get { return m_WallTempSetpoint; }
@@ -928,6 +871,12 @@ namespace Venus_MainPages.ViewModels
             get { return m_ChamberPressureFeedBack; }
             set { SetProperty(ref m_ChamberPressureFeedBack, value); }
         }
+
+        public string WaferID
+        {
+            get { return m_WaferID; }
+            set { SetProperty(ref m_WaferID, value); }
+        }
         #endregion
 
         #region 命令
@@ -1424,7 +1373,8 @@ namespace Venus_MainPages.ViewModels
         {
                 AITHeaterData heaterData = obj as AITHeaterData;
                 var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
-                heaterView = new HeaterView(heaterData, ModuleName);
+
+                heaterView = new HeaterView(heaterData);
                 heaterView.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 heaterView.Owner = _mainWindow;
                 heaterView.Show();          
@@ -1558,11 +1508,6 @@ namespace Venus_MainPages.ViewModels
 
             ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
 
-            InnerTemperature = float.Parse(RtDataValues[$"{ModuleName}.ChillerInnerTemp"].ToString());
-            OuterTemperature = float.Parse(RtDataValues[$"{ModuleName}.ChillerOuterTemp"].ToString());
-            TopTemperature   = float.Parse(RtDataValues[$"{ModuleName}.ChillerTopTemp"].ToString());
-
-
             //HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
 
 
@@ -1590,8 +1535,8 @@ namespace Venus_MainPages.ViewModels
             BiasMatchC2 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C2");
             TurboPumpWaterFlowSwitch = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TurboPumpWaterFlowSwitch.Value");
             IsTurboPumpAtSpeed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsTurboPumpAtSpeed"); 
-            IsHasWafer= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer"); 
-
+            IsHasWafer= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer");
+            WaferID = IsHasWafer ? ModuleManager.ModuleInfos[ModuleName].WaferManager.Wafers[0].SourceName : "";
 
             if (PMCurrentState == PMState.Processing)
             {
@@ -1731,12 +1676,6 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.HasWafer");
             m_RtDataKeys.Add($"{ModuleName}.CurrentRecipeResult");
 
-            m_RtDataKeys.Add($"{ModuleName}.ChillerInnerTemp");
-            m_RtDataKeys.Add($"{ModuleName}.ChillerOuterTemp");
-            m_RtDataKeys.Add($"{ModuleName}.ChillerTopTemp");
-
-
-
 
         }
         #endregion

Venus/Venus_MainPages/ViewModels/OverVenusViewModel.cs

@@ -202,7 +202,7 @@ namespace Venus_MainPages.ViewModels
 
         private double m_ChamberPressureFeedBack;
 
-
+        private string m_WaferID;
         #endregion
 
         #region  属性
@@ -902,6 +902,12 @@ namespace Venus_MainPages.ViewModels
             get { return m_ChamberPressureFeedBack; }
             set { SetProperty(ref m_ChamberPressureFeedBack, value); }
         }
+
+        public string WaferID
+        {
+            get { return m_WaferID; }
+            set { SetProperty(ref m_WaferID, value); }
+        }
         #endregion
 
         #region 命令
@@ -1390,7 +1396,8 @@ namespace Venus_MainPages.ViewModels
         {
                 AITHeaterData heaterData = obj as AITHeaterData;
                 var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
-                heaterView = new HeaterView(heaterData,ModuleName);
+
+                heaterView = new HeaterView(heaterData);
                 heaterView.WindowStartupLocation = WindowStartupLocation.CenterScreen;
                 heaterView.Owner = _mainWindow;
                 heaterView.Show();          
@@ -1557,7 +1564,7 @@ namespace Venus_MainPages.ViewModels
                 TurboPumpWaterFlowSwitch = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TurboPumpWaterFlowSwitch.Value");
                 IsTurboPumpAtSpeed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsTurboPumpAtSpeed");
                 IsHasWafer = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer");
-
+                WaferID = IsHasWafer ? ModuleManager.ModuleInfos[ModuleName].WaferManager.Wafers[0].SourceName : "";
 
                 if (PMCurrentState == PMState.Processing)
                 {

Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -805,6 +805,7 @@
                        IsBRFOn="{Binding BRFData.IsRfOn}"
                        IsSRFOn="{Binding SRFData.IsRfOn}"
                        IsHasWafer="{Binding IsHasWafer}"
+                           WaferID="{Binding WaferID}"
                         />
 
             <!--<Ellipse Width="20" Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466" Stroke="Silver" StrokeThickness="2"/>
@@ -997,7 +998,7 @@
             </Grid>
 
         </Canvas>
-        <Grid Width="350" Height="150" Canvas.Left="1350" Canvas.Top="20"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
+        <Grid Width="360" Height="190" Canvas.Left="1350" Canvas.Top="5"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1006,6 +1007,7 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
+                <RowDefinition/>
 
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -1015,10 +1017,11 @@
             <TextBlock Grid.Row="0" Text="Recipe Name"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="2" Text="Step Type"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="3" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="4" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="5" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="6" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="3" Text="Step Description"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="4" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="5" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="6" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="7" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
 
 
             <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,2,0,0" Background="#E9EDF4"/>
@@ -1031,10 +1034,11 @@
                 </TextBlock.Text>
             </TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepType}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDescription}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
             <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black"  Foreground="White"  Cursor="Hand" Grid.Row="5" Grid.Column="1"    Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-            <TextBlock Grid.Row="6" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
+            <TextBlock Grid.Row="7" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
                 <TextBlock.Text>
                     <MultiBinding StringFormat="{}{0}/{1}">
                         <Binding Path="CurrentRecipeResult.RecipeCurrentCounter"></Binding>

Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -772,6 +772,7 @@
                        IsBRFOn="{Binding BRFData.IsRfOn}"
                        IsSRFOn="{Binding SRFData.IsRfOn}"
                        IsHasWafer="{Binding IsHasWafer}"
+                           WaferID="{Binding WaferID}"
                         />
 
             <Ellipse Width="20" Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466" Stroke="Silver" StrokeThickness="2"/>
@@ -1001,7 +1002,7 @@
             <!--<Button Width="120" Height="30" Content="Abort"            Canvas.Left="910" Canvas.Top="690"  IsEnabled="{Binding IsAutoMode}"/>
             <Button Width="120" Height="30" Content="Chamber Offline"  Canvas.Left="1110" Canvas.Top="690" IsEnabled="{Binding IsAutoMode}"/>-->
         </Canvas>
-        <Grid Width="350" Height="150" Canvas.Left="1350" Canvas.Top="20"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
+        <Grid Width="360" Height="190" Canvas.Left="1350" Canvas.Top="5"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1010,6 +1011,7 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
+                <RowDefinition/>
 
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -1019,10 +1021,11 @@
             <TextBlock Grid.Row="0" Text="Recipe Name"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="2" Text="Step Type"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="3" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="4" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="5" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="6" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="3" Text="Step Description"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="4" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="5" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="6" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="7" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
 
 
             <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,2,0,0" Background="#E9EDF4"/>
@@ -1035,10 +1038,11 @@
                 </TextBlock.Text>
             </TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepType}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
-            <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black"  Foreground="White"  Cursor="Hand" Grid.Row="5" Grid.Column="1"    Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-            <TextBlock Grid.Row="6" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
+            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDescription}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
+            <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black"  Foreground="White"  Cursor="Hand" Grid.Row="6" Grid.Column="1"    Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
+            <TextBlock Grid.Row="7" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
                 <TextBlock.Text>
                     <MultiBinding StringFormat="{}{0}/{1}">
                         <Binding Path="CurrentRecipeResult.RecipeCurrentCounter"></Binding>
@@ -1047,7 +1051,6 @@
                 </TextBlock.Text>
             </TextBlock>
         </Grid>
-
         <Grid Width="300" Height="260"  Canvas.Left="500" Canvas.Top="402" Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True">
             <Grid.RowDefinitions>
                 <RowDefinition/>
@@ -1167,33 +1170,22 @@
                 <ColumnDefinition Width="4*"/>
             </Grid.ColumnDefinitions>
           
-            <TextBlock Grid.Row="0" Text="Inner Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="1,0,0,0"/>
+            <TextBlock Grid.Row="0" Text="Chiller Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="1,0,0,0"/>
             <!--<TextBlock Grid.Row="1" Text="Wall Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="1,0,0,0"/>-->
 
-            <TextBox Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Width="Auto" Height="Auto" Text="{Binding InnerChillerTempSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
+            <TextBox Grid.Row="0" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding ChillerTempSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
             <!--<TextBox Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding WallTempSetpoint}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />-->
 
-            <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding InnerTemperature,StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-
-            <TextBlock Grid.Row="1" Text="Outer Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="1,0,0,0"/>
-            <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding OuterTemperature,StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-
-            <TextBlock Grid.Row="2" Text="Top Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="1,0,0,0"/>
-            <TextBox   Grid.Row="2" Grid.Column="1"  Width="Auto" Height="Auto" Text="{Binding TopChillerTempSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
-            <TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding TopTemperature,StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-
-            <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3" Grid.RowSpan="2">
-                <Ellipse Width="18" Height="18" Fill="{Binding ChillerIsOn,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"/>
-                <Button Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="ON/OFF"          Command="{Binding OnOffChillerCommand}"    CommandParameter="True"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
-                <Button Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"  CommandParameter="True"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
+            <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding ChillerTemperature,StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
+           
 
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="3">
+            <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3">
                 <Ellipse Width="18" Height="18" Fill="{Binding ChillerIsOn,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"/>
                 <Button Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="ON/OFF"          Command="{Binding OnOffChillerCommand}"    CommandParameter="True"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
                 <Button Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"  CommandParameter="True"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
 
             </StackPanel>
+            
 
         </Grid>
         <Grid Visibility="Hidden"  Height="120" Width="300"  Canvas.Left="400" Canvas.Top="70" Background="#E8E8E8"  unity:GridOptions.ShowBorder="True">

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -807,6 +807,7 @@
                        IsBRFOn="{Binding BRFData.IsRfOn}"
                        IsSRFOn="{Binding SRFData.IsRfOn}"
                        IsHasWafer="{Binding IsHasWafer}"
+                           WaferID="{Binding WaferID}"
                         />
 
             <Ellipse Width="20"  Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor}}"  Canvas.Left="1105" Canvas.Top="466" Stroke="Silver" StrokeThickness="2"/>
@@ -1030,7 +1031,7 @@
             <!--<Button Width="120" Height="30" Content="Abort"            Canvas.Left="910" Canvas.Top="690"  IsEnabled="{Binding IsAutoMode}"/>
             <Button Width="120" Height="30" Content="Chamber Offline"  Canvas.Left="1110" Canvas.Top="690" IsEnabled="{Binding IsAutoMode}"/>-->
         </Canvas>
-        <Grid Width="350" Height="150" Canvas.Left="1350" Canvas.Top="20"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
+        <Grid Width="360" Height="190" Canvas.Left="1350" Canvas.Top="5"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1039,6 +1040,7 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
+                <RowDefinition/>
 
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -1048,10 +1050,11 @@
             <TextBlock Grid.Row="0" Text="Recipe Name"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="1" Text="Step Num/All"        FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
             <TextBlock Grid.Row="2" Text="Step Type"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="3" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="4" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="5" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
-            <TextBlock Grid.Row="6" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="3" Text="Step Description"          FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="4" Text="Step Elpased Time"  FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="5" Text="Step Time(s)"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="6" Text="Next Step"       FontSize="15"  Padding="10,2,0,0" Background="#D0D8E8"/>
+            <TextBlock Grid.Row="7" Text="Cycle Num/All"  FontSize="15" Padding="10,2,0,0" Background="#D0D8E8"/>
 
 
             <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeName}" FontSize="15" Padding="10,2,0,0" Background="#E9EDF4"/>
@@ -1064,10 +1067,11 @@
                 </TextBlock.Text>
             </TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepType}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
-            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
-            <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black"  Foreground="White"  Cursor="Hand" Grid.Row="5" Grid.Column="1"    Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
-            <TextBlock Grid.Row="6" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
+            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDescription}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepDuringTime, StringFormat=hh\\:mm\\:ss}"  FontSize="15" Padding="10,2,0,0"/>
+            <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CurrentRecipeResult.RecipeStepSetTime}"  FontSize="15" Padding="10,2,0,0"/>
+            <customControls:PathButton BorderThickness="0" PathData="{StaticResource Icon_Next}" Background="Transparent" DefaultFillBrush="Black"  Foreground="White"  Cursor="Hand" Grid.Row="6" Grid.Column="1"    Visibility="{Binding IsProcessing,Converter={StaticResource BoolToVisibility2}}" Command="{Binding EndStepCommand}" Margin="15,0,0,0" HorizontalAlignment="Left"/>
+            <TextBlock Grid.Row="7" Grid.Column="1"   FontSize="15" Padding="10,2,0,0" Background="#E9EDF4">
                 <TextBlock.Text>
                     <MultiBinding StringFormat="{}{0}/{1}">
                         <Binding Path="CurrentRecipeResult.RecipeCurrentCounter"></Binding>
@@ -1076,7 +1080,6 @@
                 </TextBlock.Text>
             </TextBlock>
         </Grid>
-
         <Grid Width="300" Height="260"  Canvas.Left="500" Canvas.Top="402" Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True">
             <Grid.RowDefinitions>
                 <RowDefinition/>

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -326,6 +326,7 @@ namespace Venus_RT.Modules.PMs
             currentRecipeResult.RecipeType = _currentRecipe.Header.Type.ToString();
             currentRecipeResult.RecipeStepNumber = step.StepNo;
             currentRecipeResult.RecipeStepType=step.Type.ToString();
+            currentRecipeResult.RecipeStepDescription=string.IsNullOrEmpty(step.Description)? "": step.Description;
             currentRecipeResult.RecipeStepSetTime=step.Time;
             currentRecipeResult.RecipeType=_currentRecipe.Header.Type.ToString();
             //currentRecipeResult.RecipeStepDuringTime = (int)_stepTime.ElapsedMilliseconds/1000;

Venus/Venus_Themes/UserControls/Chamber.xaml

@@ -272,12 +272,13 @@
                         </Style>
                     </Grid.Style>
 
-                    
-                   
+
+
                     <Rectangle HorizontalAlignment="Left" Fill="{DynamicResource Lid_BG3}" Stroke="{DynamicResource Lid_BD}" Width="8" Margin="48,10,0,4"/>
                     <Rectangle HorizontalAlignment="Right" Fill="{DynamicResource Lid_BG3}" Stroke="{DynamicResource Lid_BD}" Width="8" Margin="0,10,48,4"/>
                     <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>

Venus/Venus_Themes/UserControls/Chamber.xaml.cs

@@ -81,5 +81,14 @@ namespace Venus_Themes.UserControls
             get { return (bool)this.GetValue(IsBRFOnProperty); }
             set { this.SetValue(IsBRFOnProperty, value); }
         }
+
+        public static readonly DependencyProperty WaferIDProperty = DependencyProperty.Register(
+          "WaferID", typeof(string), typeof(Chamber));
+
+        public string WaferID
+        {
+            get { return (string)this.GetValue(WaferIDProperty); }
+            set { this.SetValue(WaferIDProperty, value); }
+        }
     }
 }