优化abort下拉功能

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -1249,8 +1249,8 @@
 
                 <customControls:SplitButton Width="120" Height="30" Content="Abort"   Margin="50,0,30,0" Style="{StaticResource SplitButtonStyle}" Command="{Binding PMAbortCommnad}" Cursor="Hand"  Foreground="White" FontSize="18" Background="#009ad6">
                     <MenuItem Header="Stop Recipe" Cursor="Hand"                                          Command="{Binding AbortRecipeCommnad}" CommandParameter="0"/>
-                    <MenuItem Header="Stop Recipe/Stop Dechuck Step" Cursor="Hand"                        Command="{Binding AbortRecipeCommnad}" CommandParameter="1"/>
-                    <MenuItem Header="Stop Recipe/Stop Dechuck Step/Return Wafer To Foup" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
+                    <MenuItem Header="Stop Recipe=>Run Dechuck Recipe" Cursor="Hand"                        Command="{Binding AbortRecipeCommnad}" CommandParameter="1"/>
+                    <MenuItem Header="Stop Recipe=>Run Dechuck Recipe=>Return Wafer To Foup" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
                 </customControls:SplitButton>
 
                 <RadioButton Content="OffLine"   FontSize="15"   Width="120" Height="28" Margin="0 0 5 0" Style="{StaticResource Button_RadioButton}" IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},Mode=TwoWay}"/>

Venus/Venus_MainPages/Views/RecipeView.xaml

@@ -101,12 +101,19 @@
                 <RowDefinition Height="706*"/>
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Orientation="Horizontal">
-                <customeControls:PathButton PathData="{StaticResource Icon_Save}"    Content="Save"           DefaultFillBrush="White"     Command="{Binding SaveRecipeCommand}"    Margin="30,4,22,0"        FontSize="16" Height="30"   Width="140"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
-                <customeControls:PathButton PathData="{StaticResource Icon_Add}"     Content="Add Step"       DefaultFillBrush="White"     Command="{Binding AddStepCommand}"       Margin="30,4,22,0"        FontSize="16" Height="30"   Width="140"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
-                <customeControls:PathButton PathData="{StaticResource Icon_Delete}"  Content="Del Step"       DefaultFillBrush="White"     Command="{Binding DeleteStepCommand}"    Margin="30,4,22,0"        FontSize="16" Height="30"   Width="140"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
-                <customeControls:PathButton PathData="{StaticResource Icon_Refresh}"  Content="Refresh"        DefaultFillBrush="White"     Command="{Binding RefreshCommand}"      Margin="30,4,22,0"        FontSize="16" Height="30"   Width="140"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
-                <RadioButton Content="Unfrozen"   FontSize="15"   Width="120" Height="30" Margin="30,4,10,0"  Style="{StaticResource Button_RadioButton}" IsChecked="{Binding IsFrozen,Converter={StaticResource BoolToBool},Mode=TwoWay}"/>
-                <RadioButton Content="Frozen"     FontSize="15"   Width="120" Height="30" Margin="0 4 30 0" Style="{StaticResource Button_RadioButton}" IsChecked="{Binding IsFrozen,Mode=TwoWay}"/>
+                <!--<customeControls:PathButton PathData="{StaticResource Icon_Save}"    Content="Save"           DefaultFillBrush="White"     Command="{Binding SaveRecipeCommand}"    Margin="30,4,22,0"        FontSize="16" Height="30"   Width="130"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>-->
+                <customeControls:SplitButton  Content="Abort"    Style="{StaticResource SplitButtonStyle}" Command="{Binding SaveRecipeCommand}" Cursor="Hand"  Foreground="White" Margin="30,4,22,0"        FontSize="16" Height="30"   Width="130">
+                    <MenuItem Header="Save as PMA" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="0"/>
+                    <MenuItem Header="Save as PMB" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="1"/>
+                    <MenuItem Header="Save as PMC" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
+                    <MenuItem Header="Save as PMD" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
+                </customeControls:SplitButton>
+                
+                <customeControls:PathButton PathData="{StaticResource Icon_Add}"     Content="Add Step"       DefaultFillBrush="White"     Command="{Binding AddStepCommand}"       Margin="30,4,22,0"        FontSize="16" Height="30"   Width="130"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
+                <customeControls:PathButton PathData="{StaticResource Icon_Delete}"  Content="Del Step"       DefaultFillBrush="White"     Command="{Binding DeleteStepCommand}"    Margin="30,4,22,0"        FontSize="16" Height="30"   Width="130"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
+                <customeControls:PathButton PathData="{StaticResource Icon_Refresh}"  Content="Refresh"        DefaultFillBrush="White"     Command="{Binding RefreshCommand}"      Margin="30,4,22,0"        FontSize="16" Height="30"   Width="130"   VerticalContentAlignment="Center"  HorizontalAlignment="Right" VerticalAlignment="Top"/>
+                <RadioButton Content="Unfrozen"   FontSize="15"   Width="120" Height="30" Margin="30,0,10,0"  Style="{StaticResource Button_RadioButton}" IsChecked="{Binding IsFrozen,Converter={StaticResource BoolToBool},Mode=TwoWay}"/>
+                <RadioButton Content="Frozen"     FontSize="15"   Width="120" Height="30" Margin="0,0,30,0" Style="{StaticResource Button_RadioButton}" IsChecked="{Binding IsFrozen,Mode=TwoWay}"/>
             </StackPanel>
             <Grid x:Name="grid1" Grid.Row="1" IsEnabled="{Binding IsFrozen,Converter={StaticResource BoolToBool}}">
                 <Grid.RowDefinitions>

Venus/Venus_RT/Devices/IODevices/IoHighTemperatureHeater.cs

@@ -1,12 +1,10 @@
-using Aitex.Core.Common.DeviceData;
-using Aitex.Core.RT.DataCenter;
+using Aitex.Core.RT.DataCenter;
 using Aitex.Core.RT.Device;
 using Aitex.Core.RT.IOCore;
 using Aitex.Core.RT.Log;
 using Aitex.Core.RT.OperationCenter;
 using Aitex.Core.Util;
 using MECF.Framework.Common.CommonData.DeviceData;
-using MECF.Framework.Common.Equipment;
 using System;
 using System.Xml;
 using Venus_Core;
@@ -106,7 +104,6 @@ namespace Venus_RT.Devices.IODevices
             get
             {
                if (_aiTemperatureFeedback == null) return -1;
-                //return _aiMonitorTcFeedback.Value;
                 return _GetRealFloat(_aiTemperatureFeedback);
             }
             set

Venus/Venus_RT/Devices/JetKepler2200APM.cs

@@ -611,7 +611,7 @@ namespace Venus_RT.Devices
         {
             // 与yp讨论过，PM 初始化不需要
 
-            SetLiftPin(MovementPosition.Down, out _);
+            //SetLiftPin(MovementPosition.Down, out _);
 
             if (_slitDoor.State == CylinderState.Open)
             {