git-svn-id: http://10.4.3.168:50001/svn/Furnace@84 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/Common/Jobs/ProcessJobInfo.cs

@@ -83,6 +83,8 @@ namespace MECF.Framework.Common.Jobs
         public bool IsNeedChargeDummyWafer { get; set; }
         public bool IsStandbyStarted { get; set; }
         public bool IsN2PurgeMode { get; set; }
+        public string N2PurgeModeStr { get; set; }
+
         public ProcessJobInfo()
         {
             State = EnumProcessJobState.Created;

Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -33,6 +33,8 @@ using MECF.Framework.Common.Event;
 using System.IO;
 using Aitex.Common.Util;
 using static Aitex.Core.Common.DeviceData.AITConfigData;
+using MECF.Framework.Common.CommonData.SorterDefines;
+using MECF.Framework.Common.Utilities;
 
 namespace FurnaceRT.Equipments.PMs
 {
@@ -365,7 +367,7 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.{SensorPROCManualOK.DeviceName}", () => SensorPROCManualOK);
             DATA.Subscribe($"{Module}.EditRecipeName", () => EditRecipeName);
             DATA.Subscribe($"{Module}.EditRecipeStepName", () => EditRecipeStepName);
-
+         
             DATA.Subscribe($"{Module}.HTR1Enable", () => IsHTR1Enable);
             DATA.Subscribe($"{Module}.HTR2Enable", () => IsHTR2Enable);
             DATA.Subscribe($"{Module}.HTR3Enable", () => IsHTR3Enable);
@@ -1163,6 +1165,18 @@ namespace FurnaceRT.Equipments.PMs
             return true;
         }
 
+        public string GetN2PurgeModeEnumByStr(string str)
+        {
+            if ((str == N2PurgeModeEnum.ATMMode.ToString()) || (str == N2PurgeModeEnum.ATMMode.ToDescription()) || (str.StartsWith("ATM")))
+            {
+                return N2PurgeModeEnum.ATMMode.ToString();
+            }
+            if ((str == N2PurgeModeEnum.N2PurgeMode.ToString()) || (str == N2PurgeModeEnum.N2PurgeMode.ToDescription()) || (str.StartsWith("N2")))
+            {
+                return N2PurgeModeEnum.N2PurgeMode.ToString();
+            }
+            return N2PurgeModeEnum.ManualMode.ToString();
+        }
         private bool FsmStartContinue(object[] param)
         {
             return true;

Furnace/FurnaceUI/Views/Editors/RecipeHeaderView.xaml

@@ -1,13 +1,18 @@
-<UserControl x:Class="FurnaceUI.Views.Editors.RecipeHeaderView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:FurnaceUI.Views.Editors" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:cal="http://www.caliburn.org" xmlns:converter="clr-namespace:FurnaceUI.Converter"
-             mc:Ignorable="d" 
-              Height="600" Width="740" FontFamily="Segoe">
+<UserControl
+    x:Class="FurnaceUI.Views.Editors.RecipeHeaderView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cal="http://www.caliburn.org"
+    xmlns:converter="clr-namespace:FurnaceUI.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Width="740"
+    Height="600"
+    FontFamily="Segoe"
+    mc:Ignorable="d">
     <UserControl.Resources>
-        <converter:IsCheckShowStringConverter  x:Key="isCheckShowStringConverter"/>
+        <converter:IsCheckShowStringConverter x:Key="isCheckShowStringConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -16,50 +21,91 @@
         </Grid.RowDefinitions>
         <DockPanel>
             <Canvas>
-                <GroupBox Canvas.Left="90" Canvas.Top="20" Header="Range Check">
-                    <Grid Height="115" Width="550">
+                <GroupBox
+                    Canvas.Left="90"
+                    Canvas.Top="20"
+                    Header="Range Check">
+                    <Grid Width="550" Height="115">
                         <Grid.RowDefinitions>
                             <RowDefinition/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="0.7*"/>
-                            <ColumnDefinition  Width="1.3*"/>
+                            <ColumnDefinition Width="1.3*"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="Range Check" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                        <TextBlock Grid.Row="1" Text="Table Number" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                        <TextBox Grid.Row="0" Text="Not Select" Grid.Column="1" Grid.RowSpan="2" Width="300" Height="50" IsEnabled="False"/>
+                        <TextBlock
+                            Margin="20,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="Range Check"/>
+                        <TextBlock
+                            Grid.Row="1"
+                            Margin="20,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="Table Number"/>
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Grid.Column="1"
+                            Width="300"
+                            Height="50"
+                            IsEnabled="False"
+                            Text="Not Select"/>
                     </Grid>
                 </GroupBox>
 
 
-                <GroupBox Canvas.Left="90" Canvas.Top="350" Header="Special Sequence">
-                    <Grid Height="115" Width="550">
+                <GroupBox
+                    Canvas.Left="90"
+                    Canvas.Top="350"
+                    Header="Special Sequence">
+                    <Grid Width="550" Height="115">
                         <Grid.RowDefinitions>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="0.7*"/>
-                            <ColumnDefinition  Width="1.3*"/>
+                            <ColumnDefinition Width="1.3*"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="H20 Type" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                        <TextBox Grid.Row="0" Text="None" Grid.Column="1"  Width="300" Height="50" IsEnabled="False"/>
+                        <TextBlock
+                            Margin="20,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="H20 Type"/>
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="300"
+                            Height="50"
+                            IsEnabled="False"
+                            Text="None"/>
                     </Grid>
                 </GroupBox>
 
-                <GroupBox Canvas.Left="90" Canvas.Top="180" Header="N2 Purge">
-                    <Grid Height="115" Width="550">
+                <GroupBox
+                    Canvas.Left="90"
+                    Canvas.Top="180"
+                    Header="N2 Purge">
+                    <Grid Width="550" Height="115">
                         <Grid.RowDefinitions>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="0.7*"/>
-                            <ColumnDefinition  Width="1.3*"/>
+                            <ColumnDefinition Width="1.3*"/>
                         </Grid.ColumnDefinitions>
-                        <TextBlock Text="N2 Purge Mode" VerticalAlignment="Center" Margin="20,0,0,0"/>
-                        <ComboBox Grid.Row="0" Grid.Column="1" Text="{Binding CmbN2Purge}"   Width="300" Height="50">
+                        <TextBlock
+                            Margin="20,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="N2 Purge Mode"/>
+                        <ComboBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="300"
+                            Height="50"
+                            Text="{Binding CmbN2Purge}">
                             <ListBoxItem Content="None"/>
                             <ListBoxItem Content="N2 Purge"/>
+                            <ListBoxItem Content="ATM"/>
                         </ComboBox>
                     </Grid>
                 </GroupBox>
@@ -69,19 +115,30 @@
         <Border Grid.Row="2">
             <Grid>
                 <Canvas>
-                    <Button Content="Save" Canvas.Left="406" Canvas.Top="19" Width="130" Height="45"  Style="{StaticResource CommandButton}" IsEnabled="{Binding IsEnable}">
+                    <Button
+                        Canvas.Left="406"
+                        Canvas.Top="19"
+                        Width="130"
+                        Height="45"
+                        Content="Save"
+                        IsEnabled="{Binding IsEnable}"
+                        Style="{StaticResource CommandButton}">
                         <i:Interaction.Triggers>
                             <i:EventTrigger EventName="Click">
-                                <cal:ActionMessage MethodName="TempSetSave">
-                                </cal:ActionMessage>
+                                <cal:ActionMessage MethodName="TempSetSave"/>
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>
-                    <Button Content="Close" Canvas.Left="556" Canvas.Top="19" Width="130" Height="45" Style="{StaticResource CommandButton}">
+                    <Button
+                        Canvas.Left="556"
+                        Canvas.Top="19"
+                        Width="130"
+                        Height="45"
+                        Content="Close"
+                        Style="{StaticResource CommandButton}">
                         <i:Interaction.Triggers>
                             <i:EventTrigger EventName="Click">
-                                <cal:ActionMessage MethodName="TempSetCancel">
-                                </cal:ActionMessage>
+                                <cal:ActionMessage MethodName="TempSetCancel"/>
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>

Furnace/FurnaceUI/Views/Editors/RecipeHeaderView.xaml.cs

@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace FurnaceUI.Views.Editors
 {

Furnace/FurnaceUI/Views/Editors/RecipeHeaderViewModel.cs

@@ -1,26 +1,11 @@
-using Aitex.Core.RT.SCCore;
-using Caliburn.Micro;
-using Caliburn.Micro.Core;
-using MECF.Framework.Common.DataCenter;
-using MECF.Framework.Common.RecipeCenter;
+using FurnaceUI.Models;
 using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using FurnaceUI.Models;
-using FurnaceUI.Views.Parameter;
-using FurnaceUI.Views.Recipes;
 
 namespace FurnaceUI.Views.Editors
 {
     public class RecipeHeaderViewModel : FurnaceUIViewModelBase
     {
-      
-
         public bool IsSave { get; set; }
 
         public RecipeHeaderViewModel()
@@ -60,13 +45,6 @@ namespace FurnaceUI.Views.Editors
             }
         }
 
-       
-      
-
-      
-
-      
-
         public void TempSetSave()
         {
 
@@ -83,7 +61,5 @@ namespace FurnaceUI.Views.Editors
             IsSave = false;
             ((Window)GetView()).DialogResult = false;
         }
-
-      
     }
 }

Furnace/FurnaceUI/Views/Operations/StatusView.xaml

@@ -2313,6 +2313,7 @@
                                     BorderThickness="1,1,1,1">
                                     <TextBlock
                                         Margin="4"
+                                        Text="{Binding CheckO2Location,UpdateSourceTrigger=PropertyChanged}"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Background="#DAE5F1"
@@ -2331,6 +2332,7 @@
                                         <TextBlock
                                             Width="100"
                                             Margin="2"
+                                            Text="{Binding O2DensityData,UpdateSourceTrigger=PropertyChanged}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             IsEnabled="False"/>
@@ -2343,6 +2345,7 @@
                                         <TextBlock
                                             Width="100"
                                             Margin="2"
+                                            Text="{Binding O2SetCheckSetPoint,UpdateSourceTrigger=PropertyChanged}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             IsEnabled="False"/>

Furnace/FurnaceUI/Views/Operations/StatusViewModel.cs

@@ -34,6 +34,15 @@ namespace FurnaceUI.Views.Operations
     {
         #region Property   
 
+        [Subscription("PM1.CheckO2Location")]
+        public string CheckO2Location { get; set; }
+
+        [Subscription("PM1.O2SetCheckSetPoint")]
+        public string O2SetCheckSetPoint { get; set; }
+
+        [Subscription("PM1.O2DensityData")]
+        public string O2DensityData { get; set; }
+
         private bool _isShowMFCBySetPoint = false;
 
         [Subscription("LP1.CurrentLotId")]