1.修复TM控压不稳bug，LL Vent未计时关闭原因

2.修复efem 报警 ，efem not extend信号，软件加等待plc信号
3.新版本主界面ui

Venus/Framework/OpenControl/OpenSEMI.Ctrlib.Controls/Wafer.cs

@@ -23,6 +23,8 @@ namespace OpenSEMI.Ctrlib.Controls
 
 		public static readonly DependencyProperty SeasoningWaferTypeProperty;
 
+        public static readonly DependencyProperty WaferWidthProperty;
+        public static readonly DependencyProperty WaferHeightProperty;
 
 
         public string ViewType
@@ -144,7 +146,29 @@ namespace OpenSEMI.Ctrlib.Controls
         //        SetValue(IsDuplicatedProperty, value);
         //    }
         //}
-
+		public int WaferWidth
+		{
+            get
+            {
+                return (int)GetValue(WaferWidthProperty);
+            }
+            set
+            {
+                SetValue(WaferWidthProperty, value);
+            }
+        }
+
+        public int WaferHeight
+        {
+            get
+            {
+                return (int)GetValue(WaferHeightProperty);
+            }
+            set
+            {
+                SetValue(WaferHeightProperty, value);
+            }
+        }
 
         static Wafer()
 		{
@@ -157,7 +181,13 @@ namespace OpenSEMI.Ctrlib.Controls
 			SourceNameProperty = DependencyProperty.Register("SourceName", typeof(string), typeof(Wafer), new UIPropertyMetadata(string.Empty));
 			DuplicatedVisibilityProperty = DependencyProperty.Register("DuplicatedVisibility", typeof(Visibility), typeof(Wafer), new UIPropertyMetadata(Visibility.Collapsed));
 			SeasoningWaferTypeProperty = DependencyProperty.Register("SeasoningWaferType", typeof(string), typeof(Wafer), new PropertyMetadata(string.Empty));
-			FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata(typeof(Wafer), new FrameworkPropertyMetadata(typeof(Wafer)));
+
+
+            WaferWidthProperty = DependencyProperty.Register("WaferWidth", typeof(int), typeof(Wafer), new UIPropertyMetadata(90));
+            WaferHeightProperty = DependencyProperty.Register("WaferHeight", typeof(int), typeof(Wafer), new UIPropertyMetadata(11));
+
+
+            FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata(typeof(Wafer), new FrameworkPropertyMetadata(typeof(Wafer)));
 
 		}
 	}

Venus/Framework/OpenControl/generic.xaml

@@ -171,7 +171,7 @@
               </ToolTip>
             </Border.ToolTip>
             <Grid x:Name="Body_Grid">
-              <Rectangle Name="WaferCtrl_FrontView" Width="90" Height="11" Stroke="#FF232200">
+                            <Rectangle Name="WaferCtrl_FrontView" Width="{Binding WaferWidth, RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding WaferHeight, RelativeSource={RelativeSource TemplatedParent}}" Stroke="#FF232200">
                 <Rectangle.Fill>
                   <LinearGradientBrush EndPoint="1,0.5" StartPoint="0,0.5">
                     <GradientStop Color="#FFB88700" Offset="0" />

Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -351,6 +351,9 @@
     <Compile Include="Views\WaferAssociationSEUnit.xaml.cs">
       <DependentUpon>WaferAssociationSEUnit.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\NewWaferAssociationUnit.xaml.cs">
+      <DependentUpon>NewWaferAssociationUnit.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\WaferAssociationUnit.xaml.cs">
       <DependentUpon>WaferAssociationUnit.xaml</DependentUpon>
     </Compile>
@@ -591,6 +594,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\NewWaferAssociationUnit.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\WaferAssociationUnit.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -104,7 +104,7 @@ namespace Venus_MainPages.ViewModels
         private RecipeResult m_PMCRecipeResult;
         private RecipeResult m_PMDRecipeResult;
 
-        private string m_ATMModeIsOn;
+        private bool m_ATMModeIsOn;
 
 
         private float m_TMPressure;
@@ -487,7 +487,7 @@ namespace Venus_MainPages.ViewModels
             get { return m_PMDRecipeResult; }
             set { SetProperty(ref m_PMDRecipeResult, value); }
         }
-        public string ATMModeIsOn
+        public bool ATMModeIsOn
         {
             get { return m_ATMModeIsOn; }
             set { SetProperty(ref m_ATMModeIsOn, value); }
@@ -613,7 +613,7 @@ namespace Venus_MainPages.ViewModels
 
             SwitchFlag = false;
 
-            ATMModeIsOn = Convert.ToBoolean(QueryDataClient.Instance.Service.GetConfig("System.IsATMMode")) == true ? "ATM Mode On" : "ATM Mode Off";
+            ATMModeIsOn = Convert.ToBoolean(QueryDataClient.Instance.Service.GetConfig("System.IsATMMode"));
 
             LOG.Info("开启UI界面");
         }

Venus/Venus_MainPages/ViewModels/TMOperationViewModel.cs

@@ -22,10 +22,13 @@ namespace Venus_MainPages.ViewModels
     public class TMOperationViewModel : BindableBase
     {
         #region 私有字段
-        private TMOperationView m_TMOperationView;
-        private bool m_IsOFFline = true;
+        //private TMOperationView m_TMOperationView;
+        //private bool m_IsOFFline = true;
 
         private bool m_TMIsOFFline = true;
+        private bool m_LLAIsOFFline = true;
+        private bool m_LLBIsOFFline = true;
+
 
 
         private bool m_PMAIsInstalled;
@@ -184,20 +187,38 @@ namespace Venus_MainPages.ViewModels
             get { return m_TMChamberFlowSetPoint; }
             set { SetProperty(ref m_TMChamberFlowSetPoint, value); }
         }
-        public bool IsOFFline
+        //public bool IsOFFline
+        //{
+        //    get { return m_IsOFFline; }
+        //    set
+        //    {
+        //        SetProperty(ref m_IsOFFline, value);
+        //    }
+        //}
+        public bool TMIsOFFline
         {
-            get { return m_IsOFFline; }
+            get { return m_TMIsOFFline; }
             set
             {
-                SetProperty(ref m_IsOFFline, value);
+                SetProperty(ref m_TMIsOFFline, value);
             }
         }
-        public bool TMIsOFFline
+
+        public bool LLAIsOFFline
         {
-            get { return m_TMIsOFFline; }
+            get { return m_LLAIsOFFline; }
             set
             {
-                SetProperty(ref m_TMIsOFFline, value);
+                SetProperty(ref m_LLAIsOFFline, value);
+            }
+        }
+
+        public bool LLBIsOFFline
+        {
+            get { return m_LLBIsOFFline; }
+            set
+            {
+                SetProperty(ref m_LLBIsOFFline, value);
             }
         }
 
@@ -332,36 +353,36 @@ namespace Venus_MainPages.ViewModels
         public DelegateCommand<object> LoadCommand =>
             _LoadCommand ?? (_LoadCommand = new DelegateCommand<object>(OnLoad));
 
-        private DelegateCommand _HomeCommand;
-        public DelegateCommand HomeCommand =>
-            _HomeCommand ?? (_HomeCommand = new DelegateCommand(OnHome));
+        private DelegateCommand<object> _HomeCommand;
+        public DelegateCommand<object> HomeCommand =>
+            _HomeCommand ?? (_HomeCommand = new DelegateCommand<object>(OnHome));
 
         private DelegateCommand _RobotHomeCommand;
         public DelegateCommand RobotHomeCommand =>
-            _RobotHomeCommand ?? (_RobotHomeCommand = new DelegateCommand(OnHome));
+            _RobotHomeCommand ?? (_RobotHomeCommand = new DelegateCommand(OnRobotHome));
 
-        private DelegateCommand _VentCommand;
-        public DelegateCommand VentCommand =>
-            _VentCommand ?? (_VentCommand = new DelegateCommand(OnVent));
+        private DelegateCommand<object> _VentCommand;
+        public DelegateCommand<object> VentCommand =>
+            _VentCommand ?? (_VentCommand = new DelegateCommand<object>(OnVent));
 
-        private DelegateCommand _PumpCommand;
-        public DelegateCommand PumpCommand =>
-            _PumpCommand ?? (_PumpCommand = new DelegateCommand(OnPump));
+        private DelegateCommand<object> _PumpCommand;
+        public DelegateCommand<object> PumpCommand =>
+            _PumpCommand ?? (_PumpCommand = new DelegateCommand<object>(OnPump));
 
-        private DelegateCommand _PurgeCommand;
-        public DelegateCommand PurgeCommand =>
-            _PurgeCommand ?? (_PurgeCommand = new DelegateCommand(OnPurge));
+        private DelegateCommand<object> _PurgeCommand;
+        public DelegateCommand<object> PurgeCommand =>
+            _PurgeCommand ?? (_PurgeCommand = new DelegateCommand<object>(OnPurge));
 
         private DelegateCommand _LeakCheckCommand;
         public DelegateCommand LeakCheckCommand =>
             _LeakCheckCommand ?? (_LeakCheckCommand = new DelegateCommand(OnLeakCheck));
 
-        private DelegateCommand _AbortCommand;
-        public DelegateCommand AbortCommand =>
-            _AbortCommand ?? (_AbortCommand = new DelegateCommand(OnAbort));
-        private DelegateCommand<object> _ModuleCheckedCommand;
-        public DelegateCommand<object> ModuleCheckedCommand =>
-            _ModuleCheckedCommand ?? (_ModuleCheckedCommand = new DelegateCommand<object>(OnModuleChecked));
+        private DelegateCommand<object> _AbortCommand;
+        public DelegateCommand<object> AbortCommand =>
+            _AbortCommand ?? (_AbortCommand = new DelegateCommand<object>(OnAbort));
+        //private DelegateCommand<object> _ModuleCheckedCommand;
+        //public DelegateCommand<object> ModuleCheckedCommand =>
+        //    _ModuleCheckedCommand ?? (_ModuleCheckedCommand = new DelegateCommand<object>(OnModuleChecked));
 
         private DelegateCommand<object> _ControlValveCommand;
         public DelegateCommand<object> ControlValveCommand =>
@@ -394,17 +415,17 @@ namespace Venus_MainPages.ViewModels
             _ChamberDoorCloseCommand ?? (_ChamberDoorCloseCommand = new DelegateCommand<object>(OnChamberDoorClose));
 
 
-        private DelegateCommand _SetTMChamberPressureCommand;
-        public DelegateCommand SetTMChamberPressureCommand =>
-            _SetTMChamberPressureCommand ?? (_SetTMChamberPressureCommand = new DelegateCommand(OnSetTMChamberPressure));
+        private DelegateCommand<object> _SetTMChamberPressureCommand;
+        public DelegateCommand<object> SetTMChamberPressureCommand =>
+            _SetTMChamberPressureCommand ?? (_SetTMChamberPressureCommand = new DelegateCommand<object>(OnSetTMChamberPressure));
 
-        private DelegateCommand _OnlineCommand;
-        public DelegateCommand OnlineCommand =>
-            _OnlineCommand ?? (_OnlineCommand = new DelegateCommand(OnOnline));
+        private DelegateCommand<object> _OnlineCommand;
+        public DelegateCommand<object> OnlineCommand =>
+            _OnlineCommand ?? (_OnlineCommand = new DelegateCommand<object>(OnOnline));
 
-        private DelegateCommand _OfflineCommand;
-        public DelegateCommand OfflineCommand =>
-            _OfflineCommand ?? (_OfflineCommand = new DelegateCommand(OnOffline));
+        private DelegateCommand<object> _OfflineCommand;
+        public DelegateCommand<object> OfflineCommand =>
+            _OfflineCommand ?? (_OfflineCommand = new DelegateCommand<object>(OnOffline));
 
         #endregion
 
@@ -443,7 +464,7 @@ namespace Venus_MainPages.ViewModels
         {
             if (m_firstLoad)
             {
-                m_TMOperationView = (TMOperationView)tmOperationView;
+                //m_TMOperationView = (TMOperationView)tmOperationView;
                 var AllLeakCheckDa = QueryDataClient.Instance.Service.GetPMLeakCheckResult("TM");
                 if (AllLeakCheckDa != null)
                 {
@@ -453,38 +474,38 @@ namespace Venus_MainPages.ViewModels
             }
         }
 
-        private void OnHome()
+        private void OnHome(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.Home");
+            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.Home");
         }
-        //private void OnRobotHome()
-        //{
-        //    InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.RobotHome");
-        //}
-        private void OnVent()
+        private void OnRobotHome()
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Vent}");
+            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.RobotHome");
         }
-        private void OnPump()
+        private void OnVent(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Pump}");
+            InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.Vent}");
         }
-        private void OnPurge()
+        private void OnPump(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Purge}");
+            InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.Pump}");
         }
-        private void OnLeakCheck()
+        private void OnPurge(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.LeakCheck}");
+            InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.Purge}");
         }
-        private void OnAbort()
+        private void OnLeakCheck()
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Abort}");
+            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.LeakCheck}");
         }
-        private void OnModuleChecked(object obj)
+        private void OnAbort(object obj)
         {
-            m_ModuleCheckedName = obj.ToString();
+            InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.Abort}");
         }
+        //private void OnModuleChecked(object obj)
+        //{
+        //    m_ModuleCheckedName = obj.ToString();
+        //}
 
         private void OnControlValve(object obj)
         {
@@ -525,26 +546,26 @@ namespace Venus_MainPages.ViewModels
         {
             InvokeClient.Instance.Service.DoOperation($"{obj?.ToString()}.SlitDoor.Close");
         }
-        private void OnSetTMChamberPressure()
+        private void OnSetTMChamberPressure(object obj)
         {
-            if (CommonFunction.GetValue<bool>(RtDataValues, $"{m_ModuleCheckedName}.IsEnableControlPressure"))
+            if (CommonFunction.GetValue<bool>(RtDataValues, $"{obj}.IsEnableControlPressure"))
             {
-                InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.AbortControlPressure}");
+                InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.AbortControlPressure}");
 
             }
             else
             { 
-                InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.ControlPressure}");
+                InvokeClient.Instance.Service.DoOperation($"{obj}.{RtOperation.ControlPressure}");
             }
 
         }
-        private void OnOnline()
+        private void OnOnline(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Online}");
+            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.{RtOperation.Online}");
         }
-        private void OnOffline()
+        private void OnOffline(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{m_ModuleCheckedName}.{RtOperation.Offline}");
+            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.{RtOperation.Offline}");
         }
 
         #endregion
@@ -581,8 +602,11 @@ namespace Venus_MainPages.ViewModels
             TMVentExhaustValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMVentExhaustValve.IsOpen");
 
 
-            IsOFFline = !CommonFunction.GetValue<bool>(RtDataValues, $"{m_ModuleCheckedName}.IsOnline");
+            //IsOFFline = !CommonFunction.GetValue<bool>(RtDataValues, $"{m_ModuleCheckedName}.IsOnline");
             TMIsOFFline = !CommonFunction.GetValue<bool>(RtDataValues, $"TM.IsOnline");
+            LLAIsOFFline = !CommonFunction.GetValue<bool>(RtDataValues, $"LLA.IsOnline");
+            LLBIsOFFline = !CommonFunction.GetValue<bool>(RtDataValues, $"LLB.IsOnline");
+
             TMCurrentState = (TMState)(Enum.Parse(typeof(TMState), RtDataValues[$"TM.FsmState"].ToString()));
             LLACurrentState = (LLState)(Enum.Parse(typeof(LLState), RtDataValues[$"LLA.FsmState"].ToString()));
             LLBCurrentState = (LLState)(Enum.Parse(typeof(LLState), RtDataValues[$"LLB.FsmState"].ToString()));

Venus/Venus_MainPages/Views/NewWaferAssociationUnit.xaml

@@ -0,0 +1,167 @@
+<UserControl x:Class="Venus_MainPages.Views.NewWaferAssociationUnit"
+             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:unity="clr-namespace:Venus_MainPages.Unity"
+             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             mc:Ignorable="d" 
+             xmlns:customControls="clr-namespace:Venus_Themes.CustomControls;assembly=Venus_Themes"
+             xmlns:userControls="clr-namespace:Venus_Themes.UserControls;assembly=Venus_Themes"
+             xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             d:DesignHeight="450" d:DesignWidth="600" x:Name="WaferUnit">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <Grid VerticalAlignment="Top">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"></RowDefinition>
+                <RowDefinition></RowDefinition>
+            </Grid.RowDefinitions>
+            <Grid unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#E0E4E7" unity:GridOptions.LineThickness="2"  Background="#F5F7FA">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="Auto"></RowDefinition>
+                    <RowDefinition Height="Auto"></RowDefinition>
+                </Grid.RowDefinitions>
+
+                <StackPanel Grid.Row="0" Orientation="Horizontal">
+                    <TextBlock Text="Lot ID:" TextWrapping="Wrap"  Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="75"></TextBlock>
+                    <TextBox Text="{Binding WAInfo.LotId, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextWrapping="Wrap"  Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="200" IsEnabled="False" Margin="5 0 0 0"></TextBox>
+                </StackPanel>
+                <StackPanel Grid.Row="1" Orientation="Horizontal">
+                    
+                    <TextBlock Text="Sequence:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
+
+                    <customControls:CustomComBobox Width="200" x:Name="cb"  DropDownOpened="cb_DropDownOpened"  SelectionChanged="cb_SelectionChanged" Margin="0 2 0 2"/>
+
+
+                </StackPanel>
+                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                    <TextBlock Text="Pre Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
+                    <customControls:CustomComBobox Width="200" x:Name="preComboBox"  DropDownOpened="preComboBox_DropDownOpened"  SelectionChanged="preComboBox_SelectionChanged" Margin="0 2 0 2"/>
+                </StackPanel>
+                <StackPanel Grid.Row="3" Orientation="Horizontal">
+                    <TextBlock Text="Post Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
+                    <customControls:CustomComBobox Width="200" x:Name="postComboBox" DropDownOpened="postComboBox_DropDownOpened"  SelectionChanged="postComboBox_SelectionChanged" Margin="0 3 0 3"/>
+                </StackPanel>
+
+                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <Button Content="Select All"    Height="25"    Command="{Binding SelectAllCommand}"   CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" Click="SelectAllButton_Click"/>
+                    <Button Content="DeSelect All"  Height="25"    Command="{Binding UnSelectAllCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" Click="UnSelectAllButton_Click" Margin="1 0 0 0"/>
+                </StackPanel>
+                
+                <Grid Grid.Row="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Text="Name:" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                    <TextBox   Grid.Column="1" Text="{Binding WAInfo.JobID, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center" Margin="0 3 5 3"/>
+                    <TextBlock Grid.Column="2" Text="Status:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                    <TextBox   Grid.Column="3" Text="{Binding WAInfo.JobStatus, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextAlignment="Center" VerticalContentAlignment="Center" Margin="0 3 0 3"/>
+
+                   
+                </Grid>
+                <StackPanel Grid.Row="6" Orientation="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Center" >
+                    <Button Content="Create Job" Width="120" Height="25"  Command="{Binding CreateJobCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
+                    <Button Content="Abort Job"  Width="120" Height="25"  Command="{Binding AbortJobCommand}"  CommandParameter="{Binding WAInfo.JobID,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="1 0 0 0"/>
+                </StackPanel>
+                <StackPanel Grid.Row="7" Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center">
+                    <Button Content="Start" Width="70" Height="25"                   Command="{Binding StartCommand}"  CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
+                    <Button Content="Stop"  Width="70" Height="25" Margin="20,0,0,0" Command="{Binding StopCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
+                    <Button Content="Abort" Width="70" Height="25" Margin="20,0,0,0" Command="{Binding AbortCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}"/>
+                </StackPanel>
+            </Grid>
+
+            <ListBox Grid.Row="1"    
+                 
+                 ItemsSource="{Binding ElementName=WaferUnit,Path=WAInfo.ModuleData.WaferManager.Wafers}" Name="list1">
+                <ListBox.Resources>
+                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource ResourceKey={x:Type ListBoxItem}}">
+                        <Setter Property="Rectangle.StrokeThickness" Value="1"/>
+                    </Style>
+                </ListBox.Resources>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Grid Height="18" Background="#F5F7FA">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <Border BorderBrush="#E0E4E7" BorderThickness="1 1 1 0"  Width="30" Padding="5,1">
+                                <TextBlock Name="txtSlotIndex" Text="{Binding SlotIndex}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
+                            </Border>
+
+                            <Border Grid.Column="1" BorderBrush="#E0E4E7" BorderThickness="0,0,1,1" Width="200">
+                                <ctrl:Wafer Grid.Column="1" ViewType="Front" AllowDrop="True"    WaferStatus="{Binding WaferStatus}" SlotID="{Binding SlotID}" ModuleID="{Binding ModuleID}" SourceName="{Binding SequenceName}" HorizontalAlignment="Center" VerticalAlignment="Top"  Margin="0 2.5 0 0" WaferHeight="12" WaferWidth="180">
+
+                                </ctrl:Wafer>
+                            </Border>
+                               
+                            <!--<Border Grid.Column="1" BorderBrush="#E0E4E7" BorderThickness="0,0,1,1" Width="200" >
+                                <Border.Style>
+                                    <Style>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="0">
+                                                <Setter Property="Border.Background" Value="Transparent"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="1">
+                                                <Setter Property="Border.Background" Value="#FFB88700"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="2">
+                                                <Setter Property="Border.Background" Value="#FF3333FF"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="3">
+                                                <Setter Property="Border.Background" Value="Cyan"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="4">
+                                                <Setter Property="Border.Background" Value="#FF00B400"/>
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding WaferStatus}" Value="5">
+                                                <Setter Property="Border.Background" Value="Red"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
+                                <TextBlock Name="txtSeqName" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Text="{Binding SequenceName}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+                            </Border>-->
+
+                            <Border  Grid.Column="2" BorderBrush="Silver" BorderThickness="0 1 1 0"  Width="56" Padding="5,1" >
+                                <Button Width="40" Height="14"  Command="{Binding Path=DataContext.SetSequenceCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" CommandParameter="{Binding}" IsEnabled="{Binding ElementName=WaferUnit,Path=ButtonIsEnable}">
+                                    <Button.Style>
+                                        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ResourceKey={x:Type Button}}">
+                                            <Setter Property="Button.Content" Value="Remove"/>
+                                            <Setter Property="FontSize" Value="10" />
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding SequenceName}" Value="{x:Static sys:String.Empty}">
+                                                    <Setter Property="Button.Content" Value="Set"/>
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding WaferStatus}" Value="0">
+                                                    <Setter Property="Button.IsEnabled" Value="False"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Button.Style>
+                                </Button>
+                            </Border>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <!--<userControls:FOUPFrontView UnitData="{Binding WAInfo.ModuleData}"/>-->
+        </Grid>
+    </Grid>
+</UserControl>

Venus/Venus_MainPages/Views/NewWaferAssociationUnit.xaml.cs

@@ -0,0 +1,138 @@
+using MECF.Framework.Common.DataCenter;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using Venus_MainPages.Unity;
+
+namespace Venus_MainPages.Views
+{
+    /// <summary>
+    /// WaferAssociationUnit.xaml 的交互逻辑
+    /// </summary>
+    public partial class NewWaferAssociationUnit : UserControl
+    {
+        public NewWaferAssociationUnit()
+        {
+            InitializeComponent();
+        }
+        public WaferAssociationInfo WAInfo
+        {
+            get { return (WaferAssociationInfo)GetValue(WAInfoProperty); }
+            set { SetValue(WAInfoProperty, value); }
+        }
+        public static readonly DependencyProperty WAInfoProperty = DependencyProperty.Register("WAInfo", typeof(WaferAssociationInfo), typeof(NewWaferAssociationUnit));
+
+        public string SequenceName
+        {
+            get { return (string)GetValue(SequenceNameProperty); }
+            set { SetValue(SequenceNameProperty, value); }
+        }
+        public static readonly DependencyProperty SequenceNameProperty = DependencyProperty.Register("SequenceName", typeof(string), typeof(NewWaferAssociationUnit));
+
+        public int SelectedIndex
+        {
+            get { return (int)GetValue(SelectedIndexProperty); }
+            set { SetValue(SelectedIndexProperty, value); }
+        }
+        public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register("SelectedIndex", typeof(int), typeof(NewWaferAssociationUnit),new PropertyMetadata(1));
+
+        public bool ButtonIsEnable
+        {
+            get { return (bool)GetValue(ButtonIsEnableProperty); }
+            set { SetValue(ButtonIsEnableProperty, value); }
+        }
+        public static readonly DependencyProperty ButtonIsEnableProperty = DependencyProperty.Register("ButtonIsEnable", typeof(bool), typeof(NewWaferAssociationUnit), new PropertyMetadata(true));
+
+        private void cb_DropDownOpened(object sender, EventArgs e)
+        {
+            cb.ItemsSource = GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "Sequence")).ToList();
+        }
+        
+        private void cb_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            WAInfo.SequenceName = cb.SelectedValue.ToString();
+        }
+
+        private void preComboBox_DropDownOpened(object sender, EventArgs e)
+        {
+            List<string> cleanRecipes=new List<string>();
+            string installModules = (string)QueryDataClient.Instance.Service.GetConfig("System.InstalledModules");
+            if (installModules.Contains("PMA"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMA","Clean")).ToList());
+            }
+            if (installModules.Contains("PMB"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMB", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMC"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMC", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMD"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMD", "Clean")).ToList());
+            }
+            cleanRecipes.Add("");
+            preComboBox.ItemsSource = cleanRecipes.Distinct();
+        }
+
+        private void preComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            WAInfo.PreCleanRecipeName= preComboBox.SelectedValue.ToString();
+        }
+        private void postComboBox_DropDownOpened(object sender, EventArgs e)
+        {
+            List<string> cleanRecipes = new List<string>();
+            string installModules = (string)QueryDataClient.Instance.Service.GetConfig("System.InstalledModules");
+            if (installModules.Contains("PMA"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMA", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMB"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMB", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMC"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMC", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMD"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMD", "Clean")).ToList());
+            }
+            cleanRecipes.Add("");
+            postComboBox.ItemsSource = cleanRecipes.Distinct();
+        }
+
+        private void postComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            WAInfo.PostCleanRecipeName = postComboBox.SelectedValue.ToString();
+
+        }
+        private IEnumerable<string> GetFilesNames(string path)
+        {
+            if (Directory.Exists(path))
+            {
+                return Directory.GetFiles(path, "*.seq")
+      .Select(System.IO.Path.GetFileNameWithoutExtension);
+            }
+            else
+            {
+                return new List<string>();
+            }
+        }
+
+        private void SelectAllButton_Click(object sender, RoutedEventArgs e)
+        {
+            SelectedIndex = 0;
+        }
+        private void UnSelectAllButton_Click(object sender, RoutedEventArgs e)
+        {
+            SelectedIndex = 1;
+        }
+    }
+}

Venus/Venus_RT/Devices/IODevices/IoMfc.cs

@@ -328,13 +328,11 @@ namespace Venus_RT.Devices.IODevices
                         if (ModuleHelper.IsPm(Module) && (m_JetChamber == JetChamber.VenusSE || m_JetChamber == JetChamber.VenusDE))
                         {
                             flow = BitConverter.GetBytes((float)value );
-
                         }
                         else 
                         {
                             flow = BitConverter.GetBytes((float)(value * RtInstance.ANALOG_TRANS_RANGE / Scale));
-                        }
-                        
+                        }               
                     }
                     else
                     {
@@ -529,38 +527,51 @@ namespace Venus_RT.Devices.IODevices
             _aoFlow = ParseAoNode("aoFlow", node, ioModule);
             _diPressureAlarm = ParseDiNode("diPressureAlarm", node, ioModule);
 
-            _scGasName = SC.GetConfigItem($"{Module}.{Name}.GasName");
-            _scEnable = SC.GetConfigItem($"{Module}.{Name}.Enable");
-            _scN2Scale = SC.GetConfigItem($"{Module}.{Name}.MfcN2Scale");
-            _scScaleFactor = SC.GetConfigItem($"{Module}.{Name}.MfcScaleFactor");
-            _scAlarmRange = SC.GetConfigItem($"{Module}.{Name}.MfcAlarmRange");
-            _scEnableAlarm = SC.GetConfigItem($"{Module}.{Name}.MfcEnableAlarm");
-            _scAlarmTime = SC.GetConfigItem($"{Module}.{Name}.MfcAlarmTime");
-            _scDefaultSetPoint = SC.GetConfigItem($"{Module}.{Name}.DefaultSetPoint");
-            _scRegulationFactor = SC.GetConfigItem($"{module}.{Name}.FlowRegulationFactor");
+           
 
             _uniqueName = $"{Module}.{Name}";
 
-            //if (module.Contains("PM"))
-            //{
-            //    jetChamber = (JetChamber)SC.GetValue<int>($"{module}.ChamberType");
-            //}
-            //_writeMode = (MFCWriteMode)SC.GetValue<int>($"{module}.{Name}.MFCWriteMode");
 
             if(ModuleHelper.IsPm(module))
                 m_JetChamber = (JetChamber)SC.GetValue<int>($"{module}.ChamberType");
             
-            if (Name.Contains( "LLA"))
-            {
+            if (Module==ModuleName.TM.ToString() && Name.Contains( "LLA"))
+            {
+                _scGasName = SC.GetConfigItem($"LLA.{Name}.GasName");
+                _scEnable = SC.GetConfigItem($"LLA.{Name}.Enable");
+                _scN2Scale = SC.GetConfigItem($"LLA.{Name}.MfcN2Scale");
+                _scScaleFactor = SC.GetConfigItem($"LLA.{Name}.MfcScaleFactor");
+                _scAlarmRange = SC.GetConfigItem($"LLA.{Name}.MfcAlarmRange");
+                _scEnableAlarm = SC.GetConfigItem($"LLA.{Name}.MfcEnableAlarm");
+                _scAlarmTime = SC.GetConfigItem($"LLA.{Name}.MfcAlarmTime");
+                _scDefaultSetPoint = SC.GetConfigItem($"LLA.{Name}.DefaultSetPoint");
+                _scRegulationFactor = SC.GetConfigItem($"LLA.{Name}.FlowRegulationFactor");
                 _writeMode = (MFCWriteMode)SC.GetValue<int>($"LLA.{Name}.MFCWriteMode");
             }
-            else if (Name.Contains( "LLB"))
-            {
+            else if (Module == ModuleName.TM.ToString() && Name.Contains( "LLB"))
+            {
+                _scGasName = SC.GetConfigItem($"LLB.{Name}.GasName");
+                _scEnable = SC.GetConfigItem($"LLB.{Name}.Enable");
+                _scN2Scale = SC.GetConfigItem($"LLB.{Name}.MfcN2Scale");
+                _scScaleFactor = SC.GetConfigItem($"LLB.{Name}.MfcScaleFactor");
+                _scAlarmRange = SC.GetConfigItem($"LLB.{Name}.MfcAlarmRange");
+                _scEnableAlarm = SC.GetConfigItem($"LLB.{Name}.MfcEnableAlarm");
+                _scAlarmTime = SC.GetConfigItem($"LLB.{Name}.MfcAlarmTime");
+                _scDefaultSetPoint = SC.GetConfigItem($"LLB.{Name}.DefaultSetPoint");
+                _scRegulationFactor = SC.GetConfigItem($"LLB.{Name}.FlowRegulationFactor");
                 _writeMode = (MFCWriteMode)SC.GetValue<int>($"LLB.{Name}.MFCWriteMode");
-
             }
             else
-            { 
+            {
+                _scGasName = SC.GetConfigItem($"{Module}.{Name}.GasName");
+                _scEnable = SC.GetConfigItem($"{Module}.{Name}.Enable");
+                _scN2Scale = SC.GetConfigItem($"{Module}.{Name}.MfcN2Scale");
+                _scScaleFactor = SC.GetConfigItem($"{Module}.{Name}.MfcScaleFactor");
+                _scAlarmRange = SC.GetConfigItem($"{Module}.{Name}.MfcAlarmRange");
+                _scEnableAlarm = SC.GetConfigItem($"{Module}.{Name}.MfcEnableAlarm");
+                _scAlarmTime = SC.GetConfigItem($"{Module}.{Name}.MfcAlarmTime");
+                _scDefaultSetPoint = SC.GetConfigItem($"{Module}.{Name}.DefaultSetPoint");
+                _scRegulationFactor = SC.GetConfigItem($"{module}.{Name}.FlowRegulationFactor");
                 _writeMode = (MFCWriteMode)SC.GetValue<int>($"{module}.{Name}.MFCWriteMode");
             }
 

Venus/Venus_RT/Devices/JetKepler2200BPM.cs

@@ -998,7 +998,7 @@ namespace Venus_RT.Devices
 
             //SetPVPressure(0);
             SetPVPostion(1000);
-            await Task.Delay(500);
+            await Task.Delay(0);
             OpenValve(ValveType.Purge, false);
             //return true;
         }

Venus/Venus_RT/Devices/TM/JetTM.cs

@@ -146,7 +146,7 @@ namespace Venus_RT.Devices
         public bool IsLLBESlitDoorClosed => _LLBESlitDoor.State == CylinderState.Close;
         public bool IsLLBESlitDoorOpen => _LLBESlitDoor.State == CylinderState.Open;
 
-        
+
         public bool IsTMVac => _TMVacSwitch.Value;
         public bool IsLLAVac => _LLAVacSwitch.Value;
         public bool IsLLBVac => _LLBVacSwitch.Value;
@@ -665,7 +665,7 @@ namespace Venus_RT.Devices
             switch (mod)
             {
                 case ModuleName.TM:
-                    _TMVentExhaustValve.TurnValve(bOn,out _);
+                    _TMVentExhaustValve.TurnValve(bOn, out _);
                     return true;
                 case ModuleName.LLA:
                     _LLAVentExhaustValve.TurnValve(bOn, out _);
@@ -673,7 +673,7 @@ namespace Venus_RT.Devices
                 case ModuleName.LLB:
                     _LLBVentExhaustValve.TurnValve(bOn, out _);
                     return true;
-                default: 
+                default:
                     return false;
             }
         }
@@ -1041,11 +1041,11 @@ namespace Venus_RT.Devices
         {
             _TMMfc.SetPoint = (flowValue);
         }
-        public void SetLLAFlow(int flowValue)
+        public void SetLLAFlow(double flowValue)
         {
             _LLAMfc.SetPoint = (flowValue);
         }
-        public void SetLLBFlow(int flowValue)
+        public void SetLLBFlow(double flowValue)
         {
             _LLBMfc.SetPoint = (flowValue);
         }
@@ -1159,10 +1159,42 @@ namespace Venus_RT.Devices
                 return IsLLASlitDoorClosed && IsLLAESlitDoorClosed;
             }
             else if (moduleName == ModuleName.LLB)
-            { 
+            {
                 return IsLLBSlitDoorClosed && IsLLBESlitDoorClosed;
             }
             return false;
         }
+
+
+        public bool TMRobotNotExtendModule(ModuleName moduleName)
+        {
+            switch (moduleName)
+            {
+                case ModuleName.PMA:
+                    return TMRobotNotExtendToPMA;
+                case ModuleName.PMB:
+                    return TMRobotNotExtendToPMB;
+                case ModuleName.PMC:
+                    return TMRobotNotExtendToPMC;
+                case ModuleName.PMD:
+                    return TMRobotNotExtendToPMD;
+                case ModuleName.LLA:
+                    return TMRobotNotExtendToLLA;
+                case ModuleName.LLB:
+                    return TMRobotNotExtendToLLB;
+                default: return false;
+            }
+        }
+        public bool EFEMRobotNotExtendModule(ModuleName moduleName)
+        {
+            switch (moduleName)
+            {
+                case ModuleName.LLA:
+                    return EfemRobotNotExtendToLLA;
+                case ModuleName.LLB:
+                    return EfemRobotNotExtendToLLB;
+                default: return false;
+            }
+        }
     }
 }

Venus/Venus_RT/Devices/TM/SIASUNRobot.cs

@@ -287,7 +287,7 @@ namespace Venus_RT.Devices
                             //    GetEventMsg(RevMsg);
                             //}
                         }
-                        else if (RevMsg.Trim() == "_EVENT")
+                        else if (RevMsg.Trim().Contains( "_EVENT"))
                         {
                             GetEventMsg(RevMsg);
                         }

Venus/Venus_RT/Modules/EFEM/EfemSwapRoutine.cs

@@ -25,6 +25,7 @@ namespace Venus_RT.Modules.EFEM
             WaitEFEMIdle,
             MoveWafer,
             WaferMoved,
+            WaitPLCReady,
             CloseSlitDoor,
             NotifyDone,
         }
@@ -89,12 +90,12 @@ namespace Venus_RT.Modules.EFEM
             }
 
             _tmModule = Singleton<RouteManager>.Instance.GetTM();
-            if(_tmModule == null)
+            if (_tmModule == null)
             {
                 LOG.Write(eEvent.ERR_EFEM_ROBOT, Module, $"Get TM Entity failed.");
                 return RState.Failed;
             }
-                
+
 
             _moveTimeout = SC.GetValue<int>("EFEM.MotionTimeout") * 1000;
             _autoPumpOptInWafer = SC.GetValue<int>("EFEM.LLAutoPumpInWaferOpt");
@@ -109,14 +110,15 @@ namespace Venus_RT.Modules.EFEM
 
         public RState Monitor()
         {
-            Runner.Wait(SwapStep.WaitModuleReady,       () => _llModule.IsIdle,     _delay_60s)
-                .Run(SwapStep.ModulePrepare,            ModulePrepare,              IsModulePrepareReady)
-                .Run(SwapStep.OpenSlitDoor,             OpenSlitDoor,               IsSlitDoorOpen, _delay_30s)
-                .LoopStart(SwapStep.WaitEFEMIdle,       loopName(),                 _actionCount,           NullFun,                    WaitRobotReady,     _delay_60s)
-                .LoopRun(SwapStep.MoveWafer,            MoveWafer,                  WaitWaferMoved,         _moveTimeout + _delay_1s)
-                .LoopEnd(SwapStep.WaferMoved,           NullFun,                    _delay_5ms)
-                .Run(SwapStep.CloseSlitDoor,            CloseSlitDoor,              IsSlitDoorClosed, _delay_30s)
-                .End(SwapStep.NotifyDone,               NotifyLLDone,               _delay_50ms);
+            Runner.Wait(SwapStep.WaitModuleReady,   () => _llModule.IsIdle,        _delay_3m)
+                .Run(SwapStep.ModulePrepare,        ModulePrepare,                 IsModulePrepareReady)
+                .Run(SwapStep.OpenSlitDoor,         OpenSlitDoor,                  IsSlitDoorOpen,       _delay_30s)
+                .LoopStart(SwapStep.WaitEFEMIdle,   loopName(),                    _actionCount, NullFun, WaitRobotReady, _delay_60s)
+                .LoopRun(SwapStep.MoveWafer,        MoveWafer,                     WaitWaferMoved, _moveTimeout + _delay_1s)
+                .LoopEnd(SwapStep.WaferMoved,       NullFun,                       _delay_5ms)
+                .Wait(SwapStep.WaitPLCReady,        PLCIsReadyOK)
+                .Run(SwapStep.CloseSlitDoor,        CloseSlitDoor,                 IsSlitDoorClosed, _delay_30s)
+                .End(SwapStep.NotifyDone,           NotifyLLDone,                  _delay_50ms);
 
             return Runner.Status;
         }
@@ -181,7 +183,7 @@ namespace Venus_RT.Modules.EFEM
 
         private bool MoveWafer()
         {
-            if(_actionList.Count <= 0)
+            if (_actionList.Count <= 0)
             {
                 Runner.Stop("no action");
                 return true;
@@ -217,7 +219,7 @@ namespace Venus_RT.Modules.EFEM
         {
             if (_efem.Status == RState.Running)
             {
-                if(Runner.StepElapsedMS > _moveTimeout)
+                if (Runner.StepElapsedMS > _moveTimeout)
                 {
                     WaferManager.Instance.CreateDuplicatedWafer(_currentAction.SourceModule, _currentAction.SourceSlot, _currentAction.DestinationModule, _currentAction.DestinationSlot);
                     Runner.Stop($"EFEM Robot moving wafer from {_currentAction.SourceModule}.{_currentAction.SourceSlot + 1} to {_currentAction.DestinationModule}.{_currentAction.DestinationSlot + 1}, {_moveTimeout}ms");
@@ -239,6 +241,10 @@ namespace Venus_RT.Modules.EFEM
             }
         }
 
+        private bool PLCIsReadyOK()
+        {
+            return ModuleHelper.IsLoadLock(_targetModule) ? _tmModule.EFEMRobotNotExtendModule(_targetModule) : true;
+        }
         private bool NotifyLLDone()
         {
             var waferStatus = _llModule.GetWaferProcessStatus();
@@ -259,7 +265,7 @@ namespace Venus_RT.Modules.EFEM
                     bAutoPump = true;
                 }
                 else if (_sequencePattern == SequenceLLInOutPath.DInDOut &&
-                    waferStatus.processed   <= _autoPumpOptOutWafer &&
+                    waferStatus.processed <= _autoPumpOptOutWafer &&
                     waferStatus.unprocessed >= _autoPumpOptInWafer)
                 {
                     bAutoPump = true;

Venus/Venus_RT/Modules/LLs/LLEntity.cs

@@ -648,22 +648,24 @@ namespace Venus_RT.Modules
                 PostMsg(MSG.Error);
                 return false;
             }
-            if (ret == RState.End && _coolingFlag)
-            {
-                //if (_coolingStatus.Any(x => x == CoolingStatu.WaitCooling) && Singleton<RouteManager>.Instance.IsAutoRunning)
-                //{
-                //    PostMsg(MSG.AutoCooling);
-                //}
-                return true;
-            }
-            else if (_coolingFlag == false)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+
+            return ret == RState.End;
+            //if (ret == RState.End && _coolingFlag)
+            //{
+            //    //if (_coolingStatus.Any(x => x == CoolingStatu.WaitCooling) && Singleton<RouteManager>.Instance.IsAutoRunning)
+            //    //{
+            //    //    PostMsg(MSG.AutoCooling);
+            //    //}
+            //    return true;
+            //}
+            //else if (_coolingFlag == false)
+            //{
+            //    return true;
+            //}
+            //else
+            //{
+            //    return false;
+            //}
         }
 
         private bool FnAbortPrepareEFEM(object[] param)
@@ -678,9 +680,9 @@ namespace Venus_RT.Modules
             _controlPressureCheckPoint = SC.GetValue<int>($"{Module}.ControlPressureCheckPoint");
             _controlPressureSetPoint = SC.GetValue<int>($"{Module}.ControlPressureSetPoint");
             _controlFlowSetPoint = SC.GetValue<int>($"{Module}.{Module}_MFC1.DefaultSetPoint");
-            //_JetTM.TurnFastPumpValve(Module, true);
+            _JetTM.TurnFastPumpValve(Module, true);
 
-            _JetTM.TurnSoftPumpValve(Module, true);
+            //_JetTM.TurnSoftPumpValve(Module, true);
 
 
             _JetTM.TurnPurgeValve(Module, true);
@@ -701,7 +703,7 @@ namespace Venus_RT.Modules
         {
             _isEnableControlPressure = false;
 
-            //_JetTM.TurnFastPumpValve(Module, false);
+            _JetTM.TurnFastPumpValve(Module, false);
             _JetTM.TurnSoftPumpValve(Module, false);
 
             _JetTM.TurnPurgeValve(Module, false);

Venus/Venus_RT/Modules/PMs/PMLeakCheckRoutine.cs

@@ -79,7 +79,7 @@ namespace Venus_RT.Modules.PMs
         public RState Monitor()
         {
             Runner.Wait(LeakCheckStep.kPumpToBasePressure,  PumpingToBasePressure)
-                .Run(LeakCheckStep.kPumpingDelay,           StartPumpDelay,         PumpingDelay)
+                .Run(LeakCheckStep.kPumpingDelay,           StartPumpDelay,         PumpingDelay              ,1000*60*60*10)
                 .Run(LeakCheckStep.kLeakCheckDelay,         StartLeakCheck,         _leakcheckHoldTime * 1000)
                 .End(LeakCheckStep.kEnd,                    CalcLeakCheckResult,    _delay_50ms);
 

Venus/Venus_RT/Modules/TM/MFCoolingRoutine.cs

@@ -67,11 +67,11 @@ namespace Venus_RT.Modules.TM
 
             if (Module == ModuleName.LLA)
             {
-                _JetTM.SetLLAFlow((int)_coolingMFCFlow);
+                _JetTM.SetLLAFlow(_coolingMFCFlow);
             }
             else if (Module == ModuleName.LLB)
             {
-                _JetTM.SetLLBFlow((int)_coolingMFCFlow);
+                _JetTM.SetLLBFlow(_coolingMFCFlow);
             }
             _coolingStopWatch.Start();
             return true;
@@ -86,11 +86,11 @@ namespace Venus_RT.Modules.TM
             _coolingStopWatch.Reset();
             if (Module == ModuleName.LLA)
             {
-                _JetTM.SetLLAFlow(0);
+                _JetTM.SetLLAFlow(0d);
             }
             else if (Module == ModuleName.LLB)
             {
-                _JetTM.SetLLBFlow(0);
+                _JetTM.SetLLBFlow(0d);
             }
             _JetTM.TurnPurgeValve(Module, false);
             _JetTM.TurnExhaustValve(Module, false);

Venus/Venus_RT/Modules/TM/MFPMPickRoutine.cs

@@ -44,6 +44,7 @@ namespace Venus_RT.Modules.TM
             QueryAWC,
             SavePickeData,
             ClosePMSlitDoor,
+            WaitPLCReady,
             CheckAWC,
             NotifyDone,
         }
@@ -163,6 +164,7 @@ namespace Venus_RT.Modules.TM
                .Run(PickStepWithHeater.Picking,                Picking,            WaitPickDone)
                .Run(PickStepWithHeater.QueryAWC,               QueryAWC,           WaitRobotQueryDone)
                .Run(PickStepWithHeater.SavePickeData,          RecordAWCData,      NullFun)
+               .Wait(PickStepWithHeater.WaitPLCReady,          PLCIsReadyOK)
                .Run(PickStepWithHeater.ClosePMSlitDoor,        ClosePMSlitDoor,    ClosePMSlitDoorIsOK)
                //.Run(PickStepWithHeater.CheckAWC,               CheckAwc                               )
                .End(PickStepWithHeater.NotifyDone,             NotifyPMDone,       _delay_1s);
@@ -275,7 +277,10 @@ namespace Venus_RT.Modules.TM
                 return true;
             }
         }
-
+        private bool PLCIsReadyOK()
+        {
+            return _JetTM.TMRobotNotExtendModule(_targetModule);
+        }
         private bool QueryAWC()
         {
             if (!_queryAwc)

Venus/Venus_RT/Modules/TM/MFPMPlaceRoutine.cs

@@ -30,6 +30,7 @@ namespace Venus_RT.Modules.TM
             PlaceDelay,
             ArmRetract,
             SavePlaceData,
+            WaitPLCReady,
             ClosePMSlitDoor,
             NotifyDone,
         }
@@ -43,6 +44,7 @@ namespace Venus_RT.Modules.TM
             Placing,
             QueryAWC,
             SavePlaceData,
+            WaitPLCReady,
             ClosePMSlitDoor,
             NotifyDone,
         }
@@ -158,10 +160,10 @@ namespace Venus_RT.Modules.TM
               .Run(PlaceWithHeaterStep.Placing,                     Placing,                                             WaitPlaceDone)
               .Run(PlaceWithHeaterStep.QueryAWC,                    QueryAWC,                                            WaitRobotQueryDone, _delay_1s)
               .Run(PlaceWithHeaterStep.SavePlaceData,               RecordAWCData,                                       NullFun)
+              .Wait(PlaceWithHeaterStep.WaitPLCReady,               PLCIsReadyOK)
               .Run(PlaceWithHeaterStep.ClosePMSlitDoor,             ClosePMSlitDoor,                                     ClosePMSlitDoorIsOK)
-
               .End(PlaceWithHeaterStep.NotifyDone,                  NotifyPMDone,                                        _delay_50ms);
-                break;
+              break;
             }
 
             return Runner.Status;
@@ -252,7 +254,7 @@ namespace Venus_RT.Modules.TM
 
                 return false;
             }
-            else if (_robot.Status == RState.End)
+            else if (_robot.Status == RState.End && _JetTM.TMRobotNotExtendModule(_targetModule))
             {
                 WaferManager.Instance.WaferMoved(ModuleName.TMRobot, (int)_hand, _targetModule, _targetSlot);
                 return true;
@@ -379,7 +381,10 @@ namespace Venus_RT.Modules.TM
             _pmModule.PostMsg(PMEntity.MSG.PlaceReady);
             return true;
         }
-
+        private bool PLCIsReadyOK()
+        {
+            return _JetTM.TMRobotNotExtendModule(_targetModule);
+        }
         public void Abort()
         {
             //_robot.Halt();

Venus/Venus_RT/Modules/TM/MFVentRoutine.cs

@@ -42,7 +42,7 @@ namespace Venus_RT.Modules.TM
             {
                 Reset();
                 _ventingTimeout = SC.GetValue<int>($"{Module}.VentingTimeout") * 1000;
-                _SoftVentEndPressure= SC.GetValue<int>($"{Module}.SoftVentEndPressure");
+                _SoftVentEndPressure = SC.GetValue<int>($"{Module}.SoftVentEndPressure");
                 _ventTimeDelay = SC.GetValue<int>($"{Module}.OverVentTime");
                 return Runner.Start(Module, Name);
             }
@@ -52,19 +52,11 @@ namespace Venus_RT.Modules.TM
 
         public RState Monitor()
         {
-            Runner.Run(VentStep.kOpenSoftVent,      OpenSoftVentValve,   IsSoftVentEnd)
-                  .Run(VentStep.KSwitchFastVent,    SwitchFastVentValve, IsPressureReady, _ventingTimeout)
-                  .Delay(VentStep.KDelay,           _ventTimeDelay)
-                  .Run(VentStep.kCloseVentValves,   CloseVentValve, _delay_1s)
-                  .End(VentStep.kCloseExhaustValve, CloseExhaustValve);
-
-
-            //Runner.Run(VentStep.kOpenSoftVent,     OpenSoftVentValve,   IsSoftVentEnd)
-            //      .Run(VentStep.KSwitchFastVent,   SwitchFastVentValve, IsPressureReady, _ventingTimeout)
-            //      .Run(VentStep.kCloseVentValves,  CloseVentValve,      _delay_50ms)
-            //      .Run(VentStep.kOpenExhaustValve, OpenExhaustValve)
-            //      .Delay(VentStep.KDelay,          _ventTimeDelay)
-            //      .End(VentStep.kCloseExhaustValve,CloseExhaustValve);
+            Runner.Run(VentStep.kOpenSoftVent,       OpenSoftVentValve,   IsSoftVentEnd)
+                  .Run(VentStep.KSwitchFastVent,     SwitchFastVentValve, IsPressureReady, _ventingTimeout)
+                  .Delay(VentStep.KDelay,            _ventTimeDelay)
+                  .Run(VentStep.kCloseVentValves,    CloseVentValve,              _delay_1s)
+                  .End(VentStep.kCloseExhaustValve,  CloseExhaustValve);
 
             return Runner.Status;
         }
@@ -73,14 +65,27 @@ namespace Venus_RT.Modules.TM
         {
             _JetTM.TurnN2Valve(true);
             _JetTM.TurnPurgeValve(Module, true);
+
+            switch (Module)
+            {
+                case ModuleName.LLA:
+                    _JetTM.SetLLAFlow(2000);
+                    break;
+                case ModuleName.LLB:
+                    _JetTM.SetLLBFlow(2000);
+                    break;
+                case ModuleName.TM:
+                    _JetTM.SetTMFlow(100);
+
+                    break;
+            }
+
+
+
             return true;
         }
 
-        //private bool OpenExhaustValve()
-        //{
-        //    _JetTM.TurnExhaustValve(Module, true);
-        //    return true;
-        //}
+
         private bool CloseExhaustValve()
         {
             _JetTM.TurnExhaustValve(Module, false);
@@ -88,17 +93,24 @@ namespace Venus_RT.Modules.TM
         }
         private bool IsSoftVentEnd()
         {
-           return _JetTM.GetModulePressure(Module) > _SoftVentEndPressure;
+            return _JetTM.GetModulePressure(Module) > _SoftVentEndPressure;
         }
         private bool SwitchFastVentValve()
         {
-            if (Module == ModuleName.TM)
+            switch (Module)
             {
-                _JetTM.TurnPurgeValve(Module, false);
-
-                _JetTM.SetTMFlow(100);
-
+                case ModuleName.LLA:
+                    _JetTM.SetLLAFlow(0);
+                    break;
+                case ModuleName.LLB:
+                    _JetTM.SetLLBFlow(0);
+                    break;
+                case ModuleName.TM:
+                    _JetTM.SetTMFlow(0);
+
+                    break;
             }
+            _JetTM.TurnPurgeValve(Module, false);
             _JetTM.TurnExhaustValve(Module, true);
             _JetTM.TurnVentValve(Module, true);
 
@@ -107,15 +119,9 @@ namespace Venus_RT.Modules.TM
 
         private bool CloseVentValve()
         {
-             //_JetTM.TurnN2Valve(false);
-             _JetTM.TurnPurgeValve(Module, false);
-             _JetTM.TurnVentValve(Module, false);
-            //_JetTM.TurnExhaustValve(Module, false);
+            _JetTM.TurnPurgeValve(Module, false);
+            _JetTM.TurnVentValve(Module, false);
 
-            if (Module == ModuleName.TM)
-            {
-                _JetTM.SetTMFlow(0);
-            }
             return true;
         }
 

Venus/Venus_RT/Modules/TM/TMEntity.cs

@@ -822,6 +822,15 @@ namespace Venus_RT.Modules
         {
             return _tm.TurnEFEMSlitDoor(loadlock, open, out reason);
         }
+
+        public bool TMRobotNotExtendModule(ModuleName moduleName)
+        {
+            return _tm.TMRobotNotExtendModule(moduleName);
+        }
+        public bool EFEMRobotNotExtendModule(ModuleName moduleName)
+        {
+            return _tm.EFEMRobotNotExtendModule(moduleName);
+        }
         //private bool FsmStartTMCycle(object[] objs)
         //{
         //    return _TMCycle.Start(objs) == RState.Running;

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -815,6 +815,7 @@ namespace Venus_Simulator.Instances
 
                             //MonitorTemperature(item.Key);
                             MonitorGas(item.Key);
+
                             this.SimulateHe(item.Key);
 
                             //MonitorRF(item.Key);
@@ -829,6 +830,7 @@ namespace Venus_Simulator.Instances
                             MonitorPressure_Kepler2200(item.Key);
                             //MonitorTemperature(item.Key);
                             MonitorGas(item.Key);
+                            MonitorKeplerTMGas();
                             // MonitorRF(item.Key);
                             ChangeTime(item.Key);
                             //MonitorIOPumpCtrl(item.Key);
@@ -2895,7 +2897,13 @@ namespace Venus_Simulator.Instances
             this.SimulateMFC(mod, 8);
             this.SimulateN2(mod);
         }
+        void MonitorKeplerTMGas()
+        {
+            this.SimulateKeplerMFC(ModuleName.LLA, 1);
+            this.SimulateKeplerMFC(ModuleName.LLB, 1);
+            this.SimulateKeplerMFC(ModuleName.TM, 1);
 
+        }
         void MonitorSEGas(ModuleName mod)
         {
             SimulateMFC(mod, 1);
@@ -2928,16 +2936,14 @@ namespace Venus_Simulator.Instances
         }
         private void SimulateMFC(ModuleName mod, byte gasNum)
         {
-            var sp = GetAoValue($"{mod}.AO_MFC{gasNum}_Flow_Setpoint");
-
-
-
-            //var mock_fb = _rd.Next((int)sp - 3, (int)sp + 3) + _rd.NextDouble();
-
+            var sp = GetAoValue($"{mod}.AO_MFC{gasNum}_Flow_Setpoint");           
             SetAiValue($"{mod}.AI_MFC{gasNum}_Flow", (float)sp);
-
         }
-
+        private void SimulateKeplerMFC(ModuleName mod, byte gasNum)
+        {
+            var sp = GetAoValue($"TM.AO_{mod}_MFC{gasNum}_Flow_Setpoint");
+            SetAiValue($"TM.AI_{mod}_MFC{gasNum}_Flow", (float)sp);
+        }
         private void SimulateN2(ModuleName mod)
         {
             var sp = GetAoValue($"{mod}.AO_Turbo_Pump_N2_Flow_Setpoint");