diff --git a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs
index db67477..bad3287 100644
--- a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs
+++ b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs
@@ -374,7 +374,7 @@ namespace Rs.MotionPlat.Flow
         /// <returns></returns>
         public TurnoverInfo GetTestUnloadTask(int fromIndex)
         {
-            return testUnloadTaskList.Where(t => t.FromIndex == fromIndex-1).First();
+            return testUnloadTaskList.Where(t => t.FromIndex == fromIndex-1).FirstOrDefault();
         }
 
         /// <summary>
diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs
index 3486b5a..6ed50da 100644
--- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs
@@ -529,14 +529,52 @@ namespace Rs.AutoDischarge.V3.Flow
         public void LoadedOK()
         {
             actionFinishedEvent.WaitOne();
+            Stopwatch tm = new Stopwatch();
+            tm.Start();
             while( true ) {
-                if (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测") || GlobalVar.VirtualAxis)
+                if(tm.ElapsedMilliseconds<5000)
                 {
-                    break;
+                    if (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测") || GlobalVar.VirtualAxis)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        Thread.Sleep(100);
+                    }
                 }
                 else
                 {
-                    Thread.Sleep(100);
+                    tm.Stop();
+                    switch (m_stockType)
+                    {
+                        case ETrayType.Empty1:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测1号报警).Transform(m_stockType.ToString());
+                            break;
+                        case ETrayType.Input:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测2号报警).Transform(m_stockType.ToString());
+                            break;
+                        case ETrayType.Ok:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测3号报警).Transform(m_stockType.ToString());
+                            break;
+                        case ETrayType.Ng:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测4号报警).Transform(m_stockType.ToString());
+                            break;
+                        case ETrayType.Multi:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测5号报警).Transform(m_stockType.ToString());
+                            break;
+                        case ETrayType.Empty2:
+                            alarmEntity = AlarmCollection.Get(AlarmConstID.料仓料盘到位光电检测6号报警).Transform(m_stockType.ToString());
+                            break;
+                        default:
+                            break;
+                    }
+                    if (alarmEntity != null)
+                    {
+                        MessageQueue.Instance.Warn(GetClassName() + alarmEntity.CN);
+                        AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Retry, null);
+                        tm.Restart();
+                    }
                 }
             }
         }
diff --git a/Rs.SkyLine/Flow/WorkEnvironment.cs b/Rs.SkyLine/Flow/WorkEnvironment.cs
index b38de1c..11232bc 100644
--- a/Rs.SkyLine/Flow/WorkEnvironment.cs
+++ b/Rs.SkyLine/Flow/WorkEnvironment.cs
@@ -2,6 +2,7 @@
 using Rs.AutoDischarge.V3.Flow;
 using Rs.Framework;
 using Rs.MotionPlat.Commom;
+using Rs.MotionPlat.Entitys.Trays;
 using Rs.MotionPlat.Flow.Camera;
 using Rs.MotionPlat.Flow.SafePosFlow;
 using Rs.MotionPlat.Flow.SubFlow;
@@ -392,6 +393,7 @@ namespace Rs.MotionPlat.Flow
                         MessageQueue.Instance.Insert($"测试{i}号穴位无料");
                         Ops.Off($"测试{i}号穴位真空吸");
                         LogHelper.Debug($"关闭测试{i}号穴位真空吸");
+                        TestTrayManager.Instance.Slot(i).ResetStatus();
                     }
                 }
                 if (dischargeNozzles.Count > 0 || turnoverNozzles.Count > 0 || turnoverTraySlots.Count > 0 || socketSlots.Count > 0)
diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs
index 90e4c82..c1a2071 100644
--- a/Rs.SkyLine/Properties/AssemblyInfo.cs
+++ b/Rs.SkyLine/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("3.20.24.57")]
+ [assembly: AssemblyVersion("3.20.24.59")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]