Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.MorkMV1/Control_MorkMV1.cs

@@ -34,6 +34,7 @@ namespace BPASmartClient.MorkMV1
         GVL_MorkMV1 mORKM = new GVL_MorkMV1();
         Alarm alarm = new Alarm();
 
+
         public override void DoMain()
         {
             MonitorViewModel.DeviceId = DeviceId;
@@ -602,7 +603,7 @@ namespace BPASmartClient.MorkMV1
         private void TakeNoodleTask()
         {
             //取面控制
-            if (mORKM.AllowRun && mORKM.RobotStatus && !mORKM.Feeding && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
+            if (mORKM.AllowRun && mORKM.RobotStatus &&  !mORKM.RobotOutDinnigLock&&!mORKM.Feeding  && !mORKM.RobotTaskInterlock && mORKM.AllowTakeNoodle && mORKM.SiloInPlace && !mORKM.TakeNoodleInterlock && mORKM.RBTakeNoodleTask.Count > 0)
             {
                 if (mORKM.CurrentLoc == mORKM.CurrentFeedbackLoc)
                 {
@@ -645,7 +646,7 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         private void OutNoodleTask()
         {
-            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
+            if (mORKM.AllowInvertedFace && !mORKM.RobotOutDinnigLock  && mORKM.RobotTaskInterlock && !mORKM.TakeNoodleInterlock && mORKM.RobotStatus)
             {
                 for (int i = 0; i < mORKM.CookNodelId.Length; i++)
                 {
@@ -674,7 +675,7 @@ namespace BPASmartClient.MorkMV1
                             }
 
                             //执行取荤菜
-                            if (x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
+                            if (!mORKM.RobotOutDinnigLock && x.AcVegetableCount == x.CuVegetableCount && x.AcMeatDishesCount != x.CuMeatDishesCount)
                             {
                                 int index = x.MeatDishesLoc.FindIndex(p => p == i + 1);
                                 if (index >= 0)
@@ -734,9 +735,10 @@ namespace BPASmartClient.MorkMV1
                 mORKM.TakeNoodleInterlock = false;
                 mORKM.AllowTakeNoodle = false;
                 mORKM.TurntableInterlock = false;
+                //mORKM.NeedOutNoodle = true;
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
-
+            //机器人倒面完成信号检测
             if (RTrig.GetInstance("RobotInvertedSurfaceCom").Start(mORKM.RobotInvertedSurfaceCom))
             {
                 if (mORKM.SuborderCount.ContainsKey(mORKM.IngredientsCompleteId))
@@ -754,10 +756,10 @@ namespace BPASmartClient.MorkMV1
                         mORKM.IngredientsCompleteId = string.Empty;
                         CookComplete();
                         DeviceProcessLogShow($"倒面完成");
-
                     }
                 }
                 mORKM.RobotOutDinnigLock = false;
+                //mORKM.NeedOutNoodle = false;
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;