Merge branch 'master' of http://git.jetplasma-oa.com/JetPlasma/Venus

Venus/Venus_MainPages/Converters/BoolToHeightConverter.cs

@@ -28,4 +28,24 @@ namespace Venus_MainPages.Converters
             return null;
         }
     }
+    internal class BoolToHeightConverter2 : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            var item = (bool)value;
+            if (item == true)
+            {
+                return new System.Windows.GridLength();
+            }
+            else
+            {
+                return new System.Windows.GridLength(0);
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return null;
+        }
+    }
 }

Venus/Venus_MainPages/ViewModels/MFCVerificationViewModel.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Threading;
 using Aitex.Core.Common.DeviceData;
 using MECF.Framework.Common.DataCenter;
@@ -45,6 +46,8 @@ namespace Venus_MainPages.ViewModels
         private bool m_MFC7IsEnable;
         private bool m_MFC8IsEnable;
 
+        private MFCVerificationView m_MFCVerificationView;
+
         #endregion
 
 
@@ -155,9 +158,9 @@ namespace Venus_MainPages.ViewModels
             _SelectGasCommand ?? (_SelectGasCommand = new DelegateCommand(OnSelectGas));
 
 
-        private DelegateCommand _LoadCommand;
-        public DelegateCommand LoadCommand =>
-            _LoadCommand ?? (_LoadCommand = new DelegateCommand(OnLoad));
+        private DelegateCommand<object> _LoadCommand;
+        public DelegateCommand<object> LoadCommand =>
+            _LoadCommand ?? (_LoadCommand = new DelegateCommand<object>(OnLoad));
 
 
         #endregion
@@ -219,11 +222,36 @@ namespace Venus_MainPages.ViewModels
         //        VerificationDataRecords = new ObservableCollection<MFCVerificationData>(AllLeakCheckDa);
         //    }
         //}
-        private void OnLoad()
+        private void OnLoad(object mFCVerificationView)
         {
             InitTable();
             MFC7IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas7.Enable");
             MFC8IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas8.Enable");
+            m_MFCVerificationView = mFCVerificationView as MFCVerificationView;
+            if ( m_MFCVerificationView == null ) { return; }
+            if (MFC7IsEnable == false)
+            {
+                m_MFCVerificationView.DataGridTemplateColumn7.Visibility = Visibility.Hidden;
+                m_MFCVerificationView.OnePointDataGridTemplateColumn7.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                m_MFCVerificationView.DataGridTemplateColumn7.Visibility = Visibility.Visible;
+                m_MFCVerificationView.OnePointDataGridTemplateColumn7.Visibility = Visibility.Visible;
+
+            }
+            if (MFC8IsEnable == false)
+            {
+                m_MFCVerificationView.DataGridTemplateColumn8.Visibility = Visibility.Hidden;
+                m_MFCVerificationView.OnePointDataGridTemplateColumn8.Visibility = Visibility.Hidden;
+
+            }
+            else
+            {
+                m_MFCVerificationView.DataGridTemplateColumn8.Visibility = Visibility.Visible;
+                m_MFCVerificationView.OnePointDataGridTemplateColumn8.Visibility = Visibility.Visible;
+
+            }
         }
         #endregion
 

Venus/Venus_MainPages/Views/MFCVerificationView.xaml

@@ -14,12 +14,13 @@
              d:DesignHeight="1450" d:DesignWidth="1400" x:Name="MFCVerificationView1">
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Loaded">
-            <i:InvokeCommandAction Command="{Binding LoadCommand}"/>
+            <i:InvokeCommandAction Command="{Binding LoadCommand}" CommandParameter="{Binding ElementName=MFCVerificationView1}"/>
         </i:EventTrigger>
     </i:Interaction.Triggers>
     <UserControl.Resources>
         <converters:MultiBindingConverter x:Key="MultiBindingConverter"/>
         <converters:MFCErrorConverters x:Key="MFCErrorConverters"/>
+        <converters:BoolToHeightConverter2 x:Key="BoolToHeightConverter2"/>
     </UserControl.Resources>
 
     <Canvas>
@@ -91,8 +92,7 @@
 
 
 
-        <DataGrid AutoGenerateColumns="False"   CanUserAddRows="False" 
-                  Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}"
+        <DataGrid AutoGenerateColumns="False"   CanUserAddRows="False"
                   ItemsSource="{Binding MFCCalibrationTenPointsDataRecords}" 
                   FontFamily="Arial" FontSize="14" Height="260" IsReadOnly="True" Width="1920"   VerticalScrollBarVisibility="Auto" Canvas.Top="50">
             <DataGrid.Columns>
@@ -458,7 +458,7 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTemplateColumn  Width="*" Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
+                <DataGridTemplateColumn Width="*" x:Name="DataGridTemplateColumn7">
                         <DataGridTemplateColumn.HeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -519,7 +519,7 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTemplateColumn  Width="*" Visibility="{Binding MFC8IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
+                <DataGridTemplateColumn Width="*"  x:Name="DataGridTemplateColumn8">
                         <DataGridTemplateColumn.HeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -950,7 +950,7 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <!--<DataGridTemplateColumn  Width="240" Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
+                    <DataGridTemplateColumn  Width="*" x:Name="OnePointDataGridTemplateColumn7">
                         <DataGridTemplateColumn.HeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -1011,7 +1011,7 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTemplateColumn  Width="240" Visibility="{Binding MFC8IsEnable,Converter={StaticResource bool2VisibilityConverter}}">
+                    <DataGridTemplateColumn  Width="*" x:Name="OnePointDataGridTemplateColumn8">
                         <DataGridTemplateColumn.HeaderStyle>
                             <Style TargetType="DataGridColumnHeader">
                                 <Setter Property="HorizontalContentAlignment" Value="Center"/>
@@ -1071,7 +1071,7 @@
                                 </Grid>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>-->
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
 

Venus/Venus_MainPages/Views/MFCVerificationView.xaml.cs

@@ -29,6 +29,19 @@ namespace Venus_MainPages.Views
         {
             (this.DataContext as MFCVerificationViewModel).ModuleName = systemName;
             (this.DataContext as MFCVerificationViewModel).Init();
-        }      
+            
+        }
+
+        //private void MFCVerificationView1_Loaded(object sender, RoutedEventArgs e)
+        //{
+        //    if ((this.DataContext as MFCVerificationViewModel).MFC7IsEnable == false)
+        //    {
+        //        DataGridTemplateColumn7.Visibility = Visibility.Collapsed;
+        //    }
+        //    if ((this.DataContext as MFCVerificationViewModel).MFC8IsEnable == false)
+        //    {
+        //        DataGridTemplateColumn8.Visibility = Visibility.Collapsed;
+        //    }
+        //}
     }
 }

Venus/Venus_RT/Devices/JetKepler2200APM.cs

@@ -980,11 +980,14 @@ namespace Venus_RT.Devices
         public override bool StartControlPressure(int pressureSetpoint, int flowSetpoint)
         {
             OpenValve(ValveType.Purge, true);
+            OpenValve(ValveType.N2, true);
+            OpenValve(ValveType.PVN22, true);
+            OpenValve(ValveType.GasFinal, false);
+
+
             OpenValve(ValveType.TurboPumpPumping, true);
 
-            OpenValve(ValveType.GasFinal, false);
 
-            FlowGas(5, flowSetpoint);
             TurnPendulumValve(true);
             SetPVPressure(pressureSetpoint);
             return true;
@@ -992,7 +995,10 @@ namespace Venus_RT.Devices
         public override bool AbortControlPressure()
         {
             OpenValve(ValveType.Purge, false);
-            FlowGas(5, 0);
+            OpenValve(ValveType.N2, false);
+            OpenValve(ValveType.PVN22, false);
+
+
             return true;
         }
         public override bool HighTemperatureHeaterGotoPosition(HighTemperatureHeaterPosition highTemperatureHeaterPosition)

Venus/Venus_RT/Devices/JetKepler2200BPM.cs

@@ -980,11 +980,14 @@ namespace Venus_RT.Devices
         public override bool StartControlPressure(int pressureSetpoint, int flowSetpoint)
         {
             OpenValve(ValveType.Purge, true);
-            OpenValve(ValveType.TurboPumpPumping, true);
-
+            OpenValve(ValveType.N2, true);
+            OpenValve(ValveType.PVN22, true);
             OpenValve(ValveType.GasFinal, false);
 
-            FlowGas(5, flowSetpoint);
+
+            OpenValve(ValveType.TurboPumpPumping, true);
+
+           
             TurnPendulumValve(true);
             SetPVPressure(pressureSetpoint);
             return true;
@@ -992,7 +995,10 @@ namespace Venus_RT.Devices
         public override bool AbortControlPressure()
         {
             OpenValve(ValveType.Purge, false);
-            FlowGas(5, 0);
+            OpenValve(ValveType.N2, false);
+            OpenValve(ValveType.PVN22, false);
+
+
             return true;
         }
         public override bool HighTemperatureHeaterGotoPosition(HighTemperatureHeaterPosition highTemperatureHeaterPosition)

Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -469,37 +469,37 @@ namespace Venus_RT.Modules.PMs
             var ProcessUnit = unit as GasControlUnit;
 
             Chamber.FlowGas(0, ProcessUnit.Gas1);
-            if (ProcessUnit.Gas1 >= 1 && ProcessUnit.ToleranceDelayTime_ms > 0)
+            if (ProcessUnit.Gas1 >= 1 )
             {
                 Chamber.OpenValve(ValveType.PV11, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
+                if (ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
                 {
                     toleranceObjects.Add(new ToleranceObject("Gas1", ProcessUnit.Gas1, ProcessUnit.Gas1WarningRange, ProcessUnit.Gas1AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
                 }
             }
             Chamber.FlowGas(1, ProcessUnit.Gas2);
-            if (ProcessUnit.Gas2 >= 1 && ProcessUnit.ToleranceDelayTime_ms > 0)
+            if (ProcessUnit.Gas2 >= 1 )
             {
                 Chamber.OpenValve(ValveType.PV21, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
+                if (ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
                 {
                     toleranceObjects.Add(new ToleranceObject("Gas2", ProcessUnit.Gas2, ProcessUnit.Gas2WarningRange, ProcessUnit.Gas2AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
                 }
             }
             Chamber.FlowGas(2, ProcessUnit.Gas3);
-            if (ProcessUnit.Gas3 >= 1 && ProcessUnit.ToleranceDelayTime_ms > 0)
+            if (ProcessUnit.Gas3 >= 1)
             {
                 Chamber.OpenValve(ValveType.PV31, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
+                if (ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
                 {
                     toleranceObjects.Add(new ToleranceObject("Gas3", ProcessUnit.Gas3, ProcessUnit.Gas3WarningRange, ProcessUnit.Gas3AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
                 }
             }
             Chamber.FlowGas(3, ProcessUnit.Gas4);
-            if (ProcessUnit.Gas4 >= 1 && ProcessUnit.ToleranceDelayTime_ms > 0)
+            if (ProcessUnit.Gas4 >= 1 )
             {
                 Chamber.OpenValve(ValveType.PV41, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
+                if (ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
                 {
                     toleranceObjects.Add(new ToleranceObject("Gas4", ProcessUnit.Gas3, ProcessUnit.Gas3WarningRange, ProcessUnit.Gas3AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
                 }
@@ -628,7 +628,7 @@ namespace Venus_RT.Modules.PMs
 
         private RState Kepler2200GasControlUnit_Check(ProcessUnitBase unit, RecipeStep step)
         {
-            var ProcessUnit = unit as GasControlUnit;
+            var ProcessUnit = unit as Kepler2200GasControlUnit;
             if (ProcessUnit.ToleranceMode != ToleranceMode.None)
             {
                 _GasFlowToleranceChecker.Monitor(Chamber.MFC1FeedBack, Chamber.MFC2FeedBack, Chamber.MFC3FeedBack, Chamber.MFC4FeedBack, Chamber.MFC5FeedBack, Chamber.MFC6FeedBack);
@@ -644,7 +644,7 @@ namespace Venus_RT.Modules.PMs
             Chamber.FlowGas(3, 0);
             Chamber.FlowGas(4, 0);
             Chamber.FlowGas(5, 0);
-            var ProcessUnit = unit as GasControlUnit;
+            var ProcessUnit = unit as Kepler2200GasControlUnit;
             if (ProcessUnit.ToleranceMode != ToleranceMode.None)
             {
                 _GasFlowToleranceChecker.End();

Venus/Venus_RT/Modules/Schedulers/SchedulerTMRobot.cs

@@ -380,7 +380,10 @@ namespace Venus_RT.Modules.Schedulers
         {
             if (items.Length == 0 || RouteManager.IsATMMode)
                 return;
-
+            if (RouteManager.IsATMMode)
+            {
+                return;
+            }
             ModuleName firstModule = items[0].SourceModule;
             List<ModuleName> lls = new List<ModuleName>();
             for (int i = 0; i < items.Length; i++)