morkf_合并并同步

BPASmartClient.MorkF/Control_MorkF.cs

@@ -315,6 +315,11 @@ namespace BPASmartClient.MorkF
                 FirePot1_Write(morkFs[num].StartPassWay[seasoning.Loc], true, num);
                 Thread.Sleep(300);
             }
+            foreach (SeasoningList seasoning in seasoningLists)
+            {
+                FirePot1_Write(morkF.StartPassWay[seasoning.Loc], false);
+                Thread.Sleep(300);
+            }
 
             foreach (SeasoningList seasoning in seasoningLists)
             {
@@ -444,6 +449,8 @@ namespace BPASmartClient.MorkF
             Thread.Sleep(200);
             MessageLog.GetInstance.Show("搅拌臂到达原点位");
 
+             
+
         }
 
         //搅拌臂去炒制位

BPASmartClient.MorkF/View/LocalMenu.xaml.cs

@@ -43,7 +43,11 @@ namespace BPASmartClient.MorkF.View
         public LocalMenu()
         {
             InitializeComponent();
-            ActionManage.GetInstance.Register(new Action(() => { this.Close(); }), "LocalMenuClose");
+            ActionManage.GetInstance.CancelRegister ("LocalMenuClose");
+            ActionManage.GetInstance.Register(new Action(() => 
+            { 
+                this.Close(); 
+            }), "LocalMenuClose");
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)