diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 51d6a30b..36e22b15 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -62,20 +62,18 @@ namespace BPASmartClient.MorkF
             }
             //流程
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T1, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.清洗槽取锅 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T2, PotActions = new List<StirFryPotAction>() { StirFryPotAction.中火持续, StirFryPotAction.加油, StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 25 });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T3, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.大火持续, StirFryPotAction.低速旋转 }, During = 5 });
-            //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() { StirFryPotAction.快速旋转 }, During = 50 });
-            //stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T4, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入A料 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, PotActions = new List<StirFryPotAction>() { StirFryPotAction.大火持续, StirFryPotAction.搅拌臂下位,  StirFryPotAction.快速旋转 }, During = 25 });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入B料 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, PotActions = new List<StirFryPotAction>() { StirFryPotAction.大火持续, StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 15 });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T8, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入C料 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T9, PotActions = new List<StirFryPotAction>() { StirFryPotAction.大火持续, StirFryPotAction.搅拌臂下位,  StirFryPotAction.快速旋转 }, During = 55 });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T10, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T2, PotActions = new List<StirFryPotAction>() { StirFryPotAction.大火持续 }, During = 5 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T3, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入A料 }, PotActions = new List<StirFryPotAction>() { StirFryPotAction.加油,StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 6 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T4, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止旋转, StirFryPotAction.停止火力, StirFryPotAction.搅拌臂上位 } });//加A料
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入B料 }, PotActions = new List<StirFryPotAction>() { StirFryPotAction.中火持续, StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 6 });
+
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() {StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });//加B料
+
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入C料 }, PotActions = new List<StirFryPotAction>() {StirFryPotAction.中火持续, StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 9 });
+
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T8, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });//加C料
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T9, PotActions = new List<StirFryPotAction>() {StirFryPotAction.中火持续,StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 30 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T10, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 }});
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T11, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.灶取锅 } });
         }
         /// <summary>
@@ -117,29 +115,28 @@ namespace BPASmartClient.MorkF
             }
             //流程
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T1, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.清洗槽取锅 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T2, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 5 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T2, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入A料 }, PotActions = new List<StirFryPotAction>() { StirFryPotAction.中火持续, StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 5 });
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T3, PotActions = new List<StirFryPotAction>() { StirFryPotAction.加油 }, During = 12 });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T4, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T5, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入A料 } });
-
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 25 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T4, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });//加A料
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6,RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入B料 }, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 25 });
 
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T8, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入B料 } });
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T9, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.低速旋转 }, During = 30 });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T7, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });//加B料
+            
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T9, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.加入C料 }, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 30 });
 
-            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T10, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T10, PotActions = new List<StirFryPotAction>() { StirFryPotAction.停止火力, StirFryPotAction.停止旋转, StirFryPotAction.搅拌臂上位 } });//加C料
+            stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6,PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 55 });
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T11, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.灶取锅 } });
         }
         public void TakePot()
         {
-           
+
             WriteData("M14.0", true);
         }
 
         public void TakePotReset()
         {
-            
+
             WriteData("M14.0", false);
         }
         public void TakeOff()
@@ -163,7 +160,7 @@ namespace BPASmartClient.MorkF
         }
         public void ThreeBlock()
         {
-         //   WriteData("M4.0", new bool[] { true, true, false, false, false, false, false, false });//0000 0001
+            //   WriteData("M4.0", new bool[] { true, true, false, false, false, false, false, false });//0000 0001
             WriteData("M4.0", new bool[] { false, true, true, false, false, false, false, false });
         }
         public void OverTurnOff()
@@ -415,12 +412,11 @@ namespace BPASmartClient.MorkF
                                             TakeBurdenATask();//执行取A料操作
                                             break;
                                         case StirFryRobotAction.加入B料:
-                                            // TakeBurdenBTask();//执行取B料操作
                                             TakeBurdenATask();//执行取B料操作
                                             break;
                                         case StirFryRobotAction.加入C料:
-                                            //TakeBurdenCTask();//执行取C料操作
-                                            TakeBurdenATask();//执行取C料操作
+                                            TakeBurdenCTask();//执行取C料操作
+
                                             break;
                                         case StirFryRobotAction.灶取锅:
                                             OutDishTask();//执行出餐操作
@@ -458,7 +454,7 @@ namespace BPASmartClient.MorkF
                                             KitchenAdjustGears(5);
                                             break;
                                         case StirFryPotAction.大火持续:
-                                            KitchenAdjustGears(6);
+                                            KitchenAdjustGears(7);
                                             break;
                                         case StirFryPotAction.停止火力:
                                             KitchenAdjustGears(0);//关闭灶加热
@@ -508,6 +504,7 @@ namespace BPASmartClient.MorkF
                 morkF.TakePotLock = false;
                 morkF.PotInPlace = false;
                 morkF.ProcessExcuteLock = false;
+                morkF.SingelOrderMaterialCom = false;
             }
 
         }
@@ -642,13 +639,10 @@ namespace BPASmartClient.MorkF
             {
                 Task.Delay(5).Wait();
             }
+            morkF.SingelOrderMaterialCom = false;
             WriteData("M14.1", false);//机器人取料完成复位
             morkF.TurnTableLock = false;//转台互锁解除
-            while (!morkF.FallMaterialComplete)//等待倒料完成
-            {
-                Task.Delay(5).Wait();
-            }
-            MessageLog.GetInstance.Show($"订单【{ order.SuborderId}】，转台{loc}配料倒料完成");
+           
 
         }
         /// <summary>
@@ -672,14 +666,14 @@ namespace BPASmartClient.MorkF
             {
                 Task.Delay(5).Wait();
             }
-
+            morkF.SingelOrderMaterialCom = false;
             WriteData("M14.1", false);//机器人取料完成复位                                                                                                      
             morkF.TurnTableLock = false;//转台互锁解除
-            while (!morkF.FallMaterialComplete)//等待倒料完成
-            {
-                Task.Delay(5).Wait();
-            }
-            MessageLog.GetInstance.Show($"订单【{ order.SuborderId}】，B料倒料完成");
+            //while (!morkF.FallMaterialComplete)//等待倒料完成
+            //{
+            //    Task.Delay(5).Wait();
+            //}
+            //MessageLog.GetInstance.Show($"订单【{ order.SuborderId}】，B料倒料完成");
         }
         /// <summary>
         /// 取调味品C料
@@ -704,13 +698,15 @@ namespace BPASmartClient.MorkF
             {
                 Task.Delay(5).Wait();
             }
+            morkF.SingelOrderMaterialCom = false;
             WriteData("M14.1", false);//机器人取料完成复位                                                                                                    
             morkF.TurnTableLock = false;//转台互锁解除
-            while (!morkF.FallMaterialComplete)
-            {
-                Task.Delay(5).Wait();
-            }
-            MessageLog.GetInstance.Show($"订单【{ order.SuborderId}】，C料倒料完成");
+            //while (!morkF.FallMaterialComplete)
+            //{
+            //    Task.Delay(5).Wait();
+            //}
+            //morkF.SingelOrderMaterialCom = true;
+            //MessageLog.GetInstance.Show($"订单【{ order.SuborderId}】，C料倒料完成");
             //}
         }
         /// <summary>
@@ -806,6 +802,17 @@ namespace BPASmartClient.MorkF
                 Task.Delay(5).Wait();
             }
             WriteData("M8.1", false);//上升完成复位
+            if (!morkF.SingelOrderMaterialCom)
+            {
+                WriteData("M14.3", true);//倒料
+                while (!morkF.FallMaterialComplete)//等待倒料完成
+                {
+                    Task.Delay(5).Wait();
+                }
+                WriteData("M14.3", false);//倒料复位
+                morkF.SingelOrderMaterialCom = true;
+                MessageLog.GetInstance.Show($"订单【{ morkF.CurrentOrderId}】，配料倒料完成");
+            }
             MessageLog.GetInstance.Show("翻转机上升完成");
 
         }
@@ -931,7 +938,7 @@ namespace BPASmartClient.MorkF
             }
 
             WriteData("M2.7", true);//加油
-            WriteData("M0.7",true);//打开抽风机
+            WriteData("M0.7", true);//打开抽风机
             MessageLog.GetInstance.Show("开始注油");
             while (!morkF.FallOilComplete)
             {
diff --git a/BPASmartClient.MorkF/GVL_MorkF.cs b/BPASmartClient.MorkF/GVL_MorkF.cs
index b08a3621..14a3155e 100644
--- a/BPASmartClient.MorkF/GVL_MorkF.cs
+++ b/BPASmartClient.MorkF/GVL_MorkF.cs
@@ -169,7 +169,10 @@ namespace BPASmartClient.MorkF
         /// 当前订单完成标志
         /// </summary>
         public bool OutMealComplete { get; set; }
-
+        /// <summary>
+        /// 单个订单取料结束
+        /// </summary>
+        public bool SingelOrderMaterialCom { get; set; }
     }
 }
 
diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml
index f859e106..4fb9fd66 100644
--- a/BPASmartClient/DeviceInfo.xml
+++ b/BPASmartClient/DeviceInfo.xml
@@ -38,7 +38,7 @@
 		</Peripherals>
 	</Device>
 
-  <Device Name="Morks" Module="BPASmartClient.MorkS.Control_Morks" DeviceId="28">
+  <!--<Device Name="Morks" Module="BPASmartClient.MorkS.Control_Morks" DeviceId="28">
     <Peripherals>
       <Peripheral Module="BPASmartClient.PLC.MorksMachine">
         <Parameters>
@@ -48,6 +48,6 @@
         </Parameters>
       </Peripheral>
     </Peripherals>
-  </Device>
+  </Device>-->
 
 </BPADevices>