优化和中控通信弹框

Rs.SkyLine/Commom/NozzleCollection.cs

@@ -117,12 +117,24 @@ namespace Rs.MotionPlat.Commom
             return null;
         }
 
-        public static Nozzle GetIdelNozzle()
+        /// <summary>
+        /// 获取空闲的吸嘴
+        /// </summary>
+        /// <param name="turnoverToTray"></param>
+        /// <returns></returns>
+        public static Nozzle GetIdelNozzle(bool turnoverToTray=false)
         {
             if (nozzles != null && nozzles.Count > 0)
+            {
+                if(turnoverToTray)
+                {
+                    return nozzles.Where(n => n.NozzleIndex!=1 && n.Status == ENozzleStatus.IDLE).First();
+                }
+                else
                 {
                     return nozzles.Where(n => n.Status == ENozzleStatus.IDLE).First();
                 }
+            }
             return null;
         }
 

Rs.SkyLine/Flow/AlarmConstID.cs

@@ -62,5 +62,20 @@ namespace Rs.MotionPlat.Flow
         /// Empty2缺料报警
         /// </summary>
         public const int Empty2NullAlarm = 11;
+
+        /// <summary>
+        /// 下相机飞拍失败报警
+        /// </summary>
+        public const int DownCameraFlyFailAlarm = 12;
+
+        /// <summary>
+        /// 运动不安全报警
+        /// </summary>
+        public const int MoveUnsafeAlarm = 13;
+
+        /// <summary>
+        /// 运动失败报警
+        /// </summary>
+        public const int MoveFailAlarm = 14;
     }
 }

Rs.SkyLine/Flow/LoadAndUnloadTask.cs

@@ -532,7 +532,7 @@ namespace Rs.MotionPlat.Flow
 
         public TurnoverInfo GetUnLoadTask()
         {
-            if (unloadTaskList == null)
+            if (unloadTaskList == null || unloadTaskList.Where(t => t.Dealed == false).Count()==0)
                 return null;
             else
             {

Rs.SkyLine/Program.cs

@@ -20,8 +20,6 @@ namespace Rs.MotionPlat
         static void Main()
         {
 
-           List<TurnoverInfo> list =  RearrangeManager.GeneralRearrangeTask( TurnoverType.ToBeTested, 15, 1);
-
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //Application.Run(new FormIO2());