1、增加当安全门打开时弹框、关闭安全门时弹框关闭

Rs.SkyLine/Commom/AlarmMsg.cs

@@ -49,5 +49,15 @@ namespace Rs.MotionPlat.Commom
             msg.ButtonContexts = buttonText;
             return Show(msg);
         }
+        public static ETipButton ShowNoButton(int no, AlarmEntity alarmInfo)
+        {
+            AlarmItem msg = new AlarmItem();
+            msg.NO = no;
+            msg.ZH = alarmInfo.CN;
+            msg.EN = alarmInfo.EN;
+            msg.KO = alarmInfo.KO;
+            msg.Button =  ETipButton.None;
+            return Show(msg);
+        }
     }
 }

Rs.SkyLine/Commom/MsgBox.cs

@@ -1,4 +1,5 @@
-using Rs.Framework;
+using NPOI.SS.Formula.Functions;
+using Rs.Framework;
 using Rs.Motion;
 using Rs.Motion.Base;
 using Rs.MotionPlat.Flow;
@@ -14,6 +15,10 @@ namespace Rs.MotionPlat.Commom
 {
     public static class MsgBox
     {
+        public static void Show(int id, string message, ETipButton button)
+        {
+            TestCenterMessageBox.Show(id, message, button);
+        }
         public static SchedulingMessageBox ShowDialog(int id,string message,ETipButton button)
         {
             TestCenterMessageBox.Show(id, message, button);
@@ -62,5 +67,16 @@ namespace Rs.MotionPlat.Commom
         {
             return ShowAxisAlarmDialog(AxisControl.GetAxis(axisName),errCode);
         }
+
+        public static void CloseWindow(int winID,ETipButton button)
+        {
+            SchedulingMessageBox box = new SchedulingMessageBox();
+            box.Button = button;
+            box.Instruction = EInstruction.CloseMessage;
+            box.TurnoverID = 0;
+            box.GroupID = 0;
+            box.ID = winID;
+            TestCenter.Instance.ReportToTestCenter(box);
+        }
     }
 }

Rs.SkyLine/Flow/AlarmConstID.cs

@@ -123,6 +123,11 @@ namespace Rs.MotionPlat.Flow
         /// </summary>
         public const int 扫码失败 = 1023;
 
+        /// <summary>
+        /// 门禁触发
+        /// </summary>
+        public const int 门禁触发 = 1024;
+
 
 
 

Rs.SkyLine/Flow/MonitorSystemButton.cs

@@ -1,12 +1,15 @@
-using Rs.Framework;
+using Rs.Controls;
+using Rs.Framework;
 using Rs.Motion;
 using Rs.MotionPlat.Commom;
+using Rs.MotionPlat.Entitys;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using static Rs.MotionPlat.Commom.SchedulingMessageBox;
 
 namespace Rs.MotionPlat.Flow
 {
@@ -252,6 +255,8 @@ namespace Rs.MotionPlat.Flow
                     break;
                 case EMonitorButtonStep.DoorOpend:
                     Ops.Stop();
+                    string alarminfo = string.Format(AlarmCollection.GetAlarm(AlarmConstID.门禁触发));
+                    MsgBox.Show(AlarmConstID.门禁触发, alarminfo, SchedulingMessageBox.ETipButton.None);
                     MessageQueue.Instance.Warn("门禁被触发");
                     step = EMonitorButtonStep.DoorClosed;
                     break;
@@ -260,6 +265,7 @@ namespace Rs.MotionPlat.Flow
                     if (signalValue == 1)
                     {
                         MessageQueue.Instance.Warn("门禁已解除");
+                        MsgBox.CloseWindow(AlarmConstID.门禁触发, ETipButton.None);
                         step = EMonitorButtonStep.Monitoring;
                         break;
                     }

Rs.SkyLine/Flow/WorkEnvironment.cs

@@ -61,26 +61,36 @@ namespace Rs.MotionPlat.Flow
                             if ((!StockManager.Instance.GetStock(ETrayType.Input).HasTray() && StockManager.Instance.GetStock(ETrayType.Input).Status!= EStockTrayStatus.Backed) 
                             || GlobalVar.VirtualAxis)
                             {
-                                logInfo = GetClassName() + $"{ETrayType.Input}料仓无料，开始给{ETrayType.Input}料仓上料";
+                                logInfo = GetClassName() + $"{ETrayType.Input}料仓无料盘，开始给{ETrayType.Input}料仓上料";
                                 MessageQueue.Instance.Insert(logInfo);
                                 Task.Run(() => {
                                     StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.Whole, null);//.Load(EStockType.Input, EStockTrayLoadMode.Whole);
                                 });
                             }
+                            else
+                            {
+                                logInfo = GetClassName() + $"{ETrayType.Input}料仓有料盘";
+                                MessageQueue.Instance.Insert(logInfo);
+                            }
                             if (!StockManager.Instance.GetStock(ETrayType.Empty2).HasTray() || GlobalVar.VirtualAxis)
                             {
-                                logInfo = GetClassName() + $"{ETrayType.Empty2}料仓无料，开始给{ETrayType.Empty2}料仓上料";
+                                logInfo = GetClassName() + $"{ETrayType.Empty2}料仓无料盘，开始给{ETrayType.Empty2}料仓上料";
                                 MessageQueue.Instance.Insert(logInfo);
                                 Task.Run(() => {
                                     StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null);//.Load(EStockType.Empty2, EStockTrayLoadMode.Whole);
                                 });
                             }
+                            else
+                            {
+                                logInfo = GetClassName() + $"{ETrayType.Empty2}料仓有料盘";
+                                MessageQueue.Instance.Insert(logInfo);
+                            }
                             step = EStockCheckStep.Ok料仓是否就绪;
                             break;
                         case EStockCheckStep.Ok料仓是否就绪:
                             if (!StockManager.Instance.GetStock(ETrayType.Ok).HasTray() || GlobalVar.VirtualAxis)
                             {
-                                logInfo = GetClassName() + $"{ETrayType.Ok}料仓无料，开始给{ETrayType.Ok}料仓上料";
+                                logInfo = GetClassName() + $"{ETrayType.Ok}料仓无料盘，开始给{ETrayType.Ok}料仓上料";
                                 MessageQueue.Instance.Insert(logInfo);
                                 //if (StockManager.Instance.HasTray(EStockType.Empty2))
                                 {
@@ -113,6 +123,8 @@ namespace Rs.MotionPlat.Flow
                             }
                             else
                             {
+                                logInfo = GetClassName() + $"{ETrayType.Ok}料仓有料盘";
+                                MessageQueue.Instance.Insert(logInfo);
                                 step = EStockCheckStep.Ng料仓是否就绪;
                             }
                             break;
@@ -152,6 +164,8 @@ namespace Rs.MotionPlat.Flow
                             }
                             else
                             {
+                                logInfo = GetClassName() + $"{ETrayType.Ng}料仓有料盘";
+                                MessageQueue.Instance.Insert(logInfo);
                                 step = EStockCheckStep.Multi料仓是否就绪;
                             }
                             break;
@@ -190,6 +204,8 @@ namespace Rs.MotionPlat.Flow
                             }
                             else
                             {
+                                logInfo = GetClassName() + $"{ETrayType.Multi}料仓有料盘";
+                                MessageQueue.Instance.Insert(logInfo);
                                 step = EStockCheckStep.等待所有料仓就绪;
                             }
                             break;