update 合并ED/SD load/UnLoad操作

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

Furnace/FurnaceUI/Views/Jobs/NormalJobView.xaml

@@ -386,7 +386,7 @@
                         <Button FontFamily="Segoe" Width="370" Height="95" Margin="0,8,0,8" >
                             <ContentControl>
                                 <Canvas >
-                                    <TextBlock Text="SD Load" FontSize="20" FontFamily="Segoe" Canvas.Left="-36" Canvas.Top="-32" Foreground="White"/>
+                                    <TextBlock Text="D Load" FontSize="20" FontFamily="Segoe" Canvas.Left="-36" Canvas.Top="-32" Foreground="White"/>
                                     <Image Source="/FurnaceUI;component/Resources/images/icons/Stocker44.png" Width="40" Canvas.Left="-56" Canvas.Top="-10"/>
                                     <TextBlock Canvas.Left="-15" Canvas.Top="0" Text=" ->" FontSize="20" Foreground="White"></TextBlock>
                                     <Grid Canvas.Left="20" Canvas.Top="-10">
@@ -430,7 +430,7 @@
                         <Button FontFamily="Segoe" Width="370" Height="95" Margin="0,8,0,8" >
                             <ContentControl>
                                 <Canvas >
-                                    <TextBlock Text="SD Unload" FontSize="20" FontFamily="Segoe" Canvas.Left="-46" Canvas.Top="-32" Foreground="White"/>
+                                    <TextBlock Text="D Unload" FontSize="20" FontFamily="Segoe" Canvas.Left="-46" Canvas.Top="-32" Foreground="White"/>
                                     <Image Source="/FurnaceUI;component/Resources/images/icons/Stocker44.png" Width="40" Canvas.Left="-56" Canvas.Top="-10"/>
                                     <TextBlock Canvas.Left="-15" Canvas.Top="0" Text=" &lt;-" FontSize="20" Foreground="White"></TextBlock>
                                     <Grid Canvas.Left="20" Canvas.Top="-10">
@@ -470,7 +470,7 @@
                         </Button>
                     </Border>
 
-                    <Border Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,0" CornerRadius="0,0,0,15">
+                    <Border Visibility="Hidden" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,0" CornerRadius="0,0,0,15">
                         <Button FontFamily="Segoe" Width="370" Height="95" Margin="0,8,0,8" >
                             <ContentControl>
                                 <Canvas >
@@ -514,7 +514,7 @@
                         </Button>
                     </Border>
 
-                    <Border Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="3" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,0" CornerRadius="0,0,15,0">
+                    <Border Visibility="Hidden" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="3" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,0" CornerRadius="0,0,15,0">
                         <Button FontFamily="Segoe" Width="370" Height="95" Margin="0,8,0,8" >
                             <ContentControl>
                                 <Canvas >

Furnace/FurnaceUI/Views/Jobs/NormalJobViewModel.cs

@@ -238,7 +238,7 @@ namespace FurnaceUI.Views.Jobs
                         loadJOBViewModel.M1TypeRadioButtonVisibility = Visibility.Collapsed;
                         loadJOBViewModel.M2TypeRadioButtonVisibility = Visibility.Collapsed;
                         loadJOBViewModel.SDTypeRadioButtonVisibility = Visibility.Visible;
-                        loadJOBViewModel.EDTypeRadioButtonVisibility = Visibility.Collapsed;
+                        loadJOBViewModel.EDTypeRadioButtonVisibility = Visibility.Visible;
                         loadJOBViewModel.IsPChecked = false;
                         loadJOBViewModel.IsSDChecked = true;
                         loadJOBViewModel.IsMChecked = false;
@@ -247,7 +247,7 @@ namespace FurnaceUI.Views.Jobs
                         loadJOBViewModel.IsEDChecked = false;
                         loadJOBViewModel.WaferType = "SD";
                         loadJOBViewModel.IsSetValue = true;
-                        (windowManager as WindowManager)?.ShowDialogWithTitle(loadJOBViewModel, null, "SD Load");
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(loadJOBViewModel, null, "D Load");
                     }
                     break;
                 case "SDUnload":
@@ -257,14 +257,15 @@ namespace FurnaceUI.Views.Jobs
                         unloadJOBViewModel.PTypeRadioButtonVisibility = Visibility.Collapsed;
                         unloadJOBViewModel.MTypeRadioButtonVisibility = Visibility.Collapsed;
                         unloadJOBViewModel.SDTypeRadioButtonVisibility = Visibility.Visible;
-                        unloadJOBViewModel.EDTypeRadioButtonVisibility = Visibility.Collapsed;
+                        unloadJOBViewModel.SDTypeRadioButtonVisibility = Visibility.Visible;
+                        unloadJOBViewModel.EDTypeRadioButtonVisibility = Visibility.Visible;
                         unloadJOBViewModel.PTypeVisibility = Visibility.Collapsed;
                         unloadJOBViewModel.MTypeVisibility = Visibility.Collapsed;
                         unloadJOBViewModel.SDTypeVisibility = Visibility.Visible;
                         unloadJOBViewModel.EDTypeVisibility = Visibility.Collapsed;
                         unloadJOBViewModel.WaferType = "SD";
                         unloadJOBViewModel.IsSDChecked = true;
-                        (windowManager as WindowManager)?.ShowDialogWithTitle(unloadJOBViewModel, null, "SD Unload");
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(unloadJOBViewModel, null, "D Unload");
                     }
                     break;
                 case "EDLoad":
@@ -286,7 +287,7 @@ namespace FurnaceUI.Views.Jobs
                         loadJOBViewModel.IsEDChecked = true;
                         loadJOBViewModel.WaferType = "ED";
                         loadJOBViewModel.IsSetValue = true;
-                        (windowManager as WindowManager)?.ShowDialogWithTitle(loadJOBViewModel, null, "ED Load");
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(loadJOBViewModel, null, "D Load");
                     }
                     break;
                 case "EDUnload":
@@ -307,7 +308,7 @@ namespace FurnaceUI.Views.Jobs
                         unloadJOBViewModel.WaferType = "ED";
                         unloadJOBViewModel.IsEDChecked = true;
 
-                        (windowManager as WindowManager)?.ShowDialogWithTitle(unloadJOBViewModel, null, "ED Unload");
+                        (windowManager as WindowManager)?.ShowDialogWithTitle(unloadJOBViewModel, null, "D Unload");
                     }
                     break;
                 default: