From d38054383f46f72611efe3c1bfee1270b2dd39bd Mon Sep 17 00:00:00 2001
From: Nah <15196688790@163.com>
Date: Thu, 11 May 2023 18:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E9=A4=90=E5=92=8C?=
 =?UTF-8?q?=E5=8F=96=E8=8F=9C=E9=80=BB=E8=BE=91=E4=BA=92=E9=94=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.MorkMV1/Control_MorkMV1.cs | 11 +++++------
 BPASmartClient.MorkMV1/GVL_MorkMV1.cs     |  5 -----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/BPASmartClient.MorkMV1/Control_MorkMV1.cs b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
index 5b5fc14e..3c08f9a7 100644
--- a/BPASmartClient.MorkMV1/Control_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/Control_MorkMV1.cs
@@ -603,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)
                 {
@@ -646,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++)
                 {
@@ -675,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)
@@ -735,7 +735,7 @@ namespace BPASmartClient.MorkMV1
                 mORKM.TakeNoodleInterlock = false;
                 mORKM.AllowTakeNoodle = false;
                 mORKM.TurntableInterlock = false;
-                mORKM.IsTakeNoodleOver = true;
+                //mORKM.NeedOutNoodle = true;
                 DeviceProcessLogShow("机器人取面完成信号检测");
             }
             //机器人倒面完成信号检测
@@ -755,12 +755,11 @@ namespace BPASmartClient.MorkMV1
                         mORKM.OutMealSortNum = mORKM.IngredientsCompleteSortNum;
                         mORKM.IngredientsCompleteId = string.Empty;
                         CookComplete();
-                        mORKM.IsTakeNoodleOver = false;
                         DeviceProcessLogShow($"倒面完成");
-
                     }
                 }
                 mORKM.RobotOutDinnigLock = false;
+                //mORKM.NeedOutNoodle = false;
             }
 
             int OutMealRequstCount = mORKM.CookNoodleCom.Where(p => p == true).ToList().Count;
diff --git a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
index 0e43ae01..1d1d96d3 100644
--- a/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
+++ b/BPASmartClient.MorkMV1/GVL_MorkMV1.cs
@@ -96,11 +96,6 @@ namespace BPASmartClient.MorkMV1
         /// </summary>
         [VariableMonitor("取面任务数量")]
         public int RBTakeNoodleTaskCount { get; set; }
-        /// <summary>
-        /// 取面是否完成，为false时为倒面完成
-        /// </summary>
-        [VariableMonitor("取面是否完成")]
-        public bool IsTakeNoodleOver { get; set; }
         #endregion
 
         #region 列表数据