煮面机更新

BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs

@@ -485,7 +485,13 @@ namespace BPASmartClient.MorkSUpgradedVer
                     mORKS.DiningComplete = bools[1];
                 }
             }));
-
+            GetStatus("M16.6", new Action<object>((obj) => 
+            {
+                if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
+                {
+                    mORKS.outFinish = bools[0];
+                }
+            }));
             GetStatus("M10.4", new Action<object>((obj) =>
             {
                 if (obj is bool[] bools && bools.Length > 0 && bools.Length <= 1)
@@ -1088,6 +1094,7 @@ namespace BPASmartClient.MorkSUpgradedVer
         {
             if (mORKS.AllowInvertedFace && mORKS.RobotTaskInterlock && !mORKS.RobotOutDinnigLock && !mORKS.TakeNoodleInterlock && mORKS.RobotStatus)
             {
+                
                 #region 修改之前的代码
 
                 //int loc = Array.FindIndex(mORKS.CookNodelId, p => p == mORKS.IngredientsCompleteId && p.Length > 0);
@@ -1114,7 +1121,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                 if (FoodMenuViewModel.orderStatusLists.Count>0)
                 {
                     int loc = mORKS.CookNodelId.ToList().FindIndex(o => o == FoodMenuViewModel.orderStatusLists.Last().OrderPush.SuborderId);
-                    if (loc>=0&&mORKS.CookNoodleCom[loc] && !mORKS.RobotOutDinnigLock)
+                    if (loc>=0&&mORKS.CookNoodleCom[loc])
                     {
                         var res = FoodMenuViewModel.orderStatusLists.FirstOrDefault(o => o.OrderPush.SuborderId == mORKS.CookNodelId[loc]);
                         if (res != null)
@@ -1132,7 +1139,8 @@ namespace BPASmartClient.MorkSUpgradedVer
                             mORKS.IngredientsCompleteId = string.Empty;
                             mORKS.CookNodelId[loc] = string.Empty;
                             DeviceProcessLogShow($"{loc + 1} 号位置出餐控制,订单ID：{mORKS.OutMealId}");
-                            mORKS.CookNoodleCom[loc] = false;
+                            mORKS.outNum = loc;
+                        
                             mORKS.RobotOutDinnigLock = true;
                         }
                         else
@@ -1194,7 +1202,15 @@ namespace BPASmartClient.MorkSUpgradedVer
                 mORKS.TakeBowlInterlock = false;
                 mORKS.RobotOutDinnigLock = false;
             }
-
+            if (RTrig.GetInstance("OutFinish").Start(mORKS.outFinish))
+            {
+                DeviceProcessLogShow("到面完成启动");
+                if (mORKS.outNum >= 0)
+                {
+                    mORKS.CookNoodleCom[mORKS.outNum] = false;
+                    mORKS.outNum = -1;
+                }
+            }
             //取餐完成逻辑处理
             if (RTrig.GetInstance("CompleteChange1").Start(mORKS.DiningComplete) && mORKS.CookCompleteFlatBit == true)
             {
@@ -1222,6 +1238,7 @@ namespace BPASmartClient.MorkSUpgradedVer
                 mORKS.OutMealId = string.Empty;
                 mORKS.OutMealName = string.Empty;
                 mORKS.OutMealSortNum = 0;
+              
             }
 
             //机器人取面完成信号检测

BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs

@@ -11,6 +11,7 @@ namespace BPASmartClient.MorkSUpgradedVer
 {
     public class GVL_MorkSUpgradedVer : IStatus
     {
+        public int outNum {  get; set; }=-1;
         #region 临时变量
         /// <summary>
         /// 允许运行
@@ -366,6 +367,11 @@ namespace BPASmartClient.MorkSUpgradedVer
         /// </summary>
         [VariableMonitor("补料中", "M102.6", "1142")]
         public bool Feeding { get; set; }
+        /// <summary>
+        /// 倒面完成
+        /// </summary>
+        [VariableMonitor("倒面完成", "M16.6", "1181")]
+        public bool outFinish { get; set; }
         #endregion
     }
 }

BPASmartClient/App.xaml.cs

@@ -31,7 +31,7 @@ namespace BPASmartClient
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            InternetInfo.IsEnableNetwork = true;
+            InternetInfo.IsEnableNetwork = false;
             DataRead();
             SystemHelper.GetInstance.CreateDesktopShortcut();
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;