Merge branch 'Master_ELK02_Release_Development' of http://git.jetplasma-oa.com/Jet/FurnaceELK into Master_ELK02_Release_Development

Furnace/FurnaceRT/Equipments/PMs/PMModuleRecipeExecutor.cs

@@ -211,7 +211,6 @@ namespace FurnaceRT.Equipments.PMs
                             }
                             break;
                         case "CEXH":
-                            IsCEXHOn=set;
                             SetCEXHEnable(new object[1] { set });
                             break;
                         case "AGV":

Furnace/FurnaceUI/Views/Jobs/WaferMapSelectedView.xaml

@@ -711,12 +711,6 @@
                                         <cal:Parameter Value="$eventargs" />
                                     </cal:ActionMessage>
                                 </i:EventTrigger>
-                                <i:EventTrigger EventName="PreviewTouchUp">
-                                    <cal:ActionMessage MethodName="AllSetCmdTouchUp">
-                                        <cal:Parameter Value="$source" />
-                                        <cal:Parameter Value="$eventargs" />
-                                    </cal:ActionMessage>
-                                </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
                         <Button
@@ -732,12 +726,6 @@
                                         <cal:Parameter Value="$eventargs" />
                                     </cal:ActionMessage>
                                 </i:EventTrigger>
-                                <i:EventTrigger EventName="PreviewTouchUp">
-                                    <cal:ActionMessage MethodName="AllClearCmdTouchUp">
-                                        <cal:Parameter Value="$source" />
-                                        <cal:Parameter Value="$eventargs" />
-                                    </cal:ActionMessage>
-                                </i:EventTrigger>
                             </i:Interaction.Triggers>
                         </Button>
                     </StackPanel>
@@ -771,12 +759,6 @@
                                     <cal:Parameter Value="$eventargs" />
                                 </cal:ActionMessage>
                             </i:EventTrigger>
-                            <i:EventTrigger EventName="PreviewTouchUp">
-                                <cal:ActionMessage MethodName="ClosedCmdTouchUp">
-                                    <cal:Parameter Value="$source" />
-                                    <cal:Parameter Value="$eventargs" />
-                                </cal:ActionMessage>
-                            </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>
                     <Button
@@ -791,12 +773,6 @@
                                     <cal:Parameter Value="$eventargs" />
                                 </cal:ActionMessage>
                             </i:EventTrigger>
-                            <i:EventTrigger EventName="PreviewTouchUp">
-                                <cal:ActionMessage MethodName="AcceptCmdTouchUp">
-                                    <cal:Parameter Value="$source" />
-                                    <cal:Parameter Value="$eventargs" />
-                                </cal:ActionMessage>
-                            </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>
                 </StackPanel>

Furnace/FurnaceUI/Views/Jobs/WaferMapSelectedViewModel.cs

@@ -641,7 +641,7 @@ namespace FurnaceUI.Views.Jobs
             }
         }
 
-        public void AllSetCmdTouchUp(string value, object source, TouchEventArgs e)
+        public void AllSetCmdTouchUp(object source, TouchEventArgs e)
         {
             AllSetCmd();
             e.Handled = true;