1、3.20.24.54

2、增加跳过信息给中控

Rs.SkyLine/Flow/LoadAndUnloadTask.cs

@@ -87,7 +87,14 @@ namespace Rs.MotionPlat.Flow
         #endregion
 
         List<TurnoverInfo> turnoverResult = new List<TurnoverInfo>();
-
+        /// <summary>
+        /// 排料跳过信息列表
+        /// </summary>
+        List<SkipInfo> dischargeSkipInfoList = new List<SkipInfo>();
+        /// <summary>
+        /// 周转跳过信息
+        /// </summary>
+        List<SkipInfo> turnoverSkipInfoList = new List<SkipInfo>();
         SqliteHelper db = new SqliteHelper();
 
         private LoadAndUnloadTask()
@@ -181,6 +188,17 @@ namespace Rs.MotionPlat.Flow
             turnoverResult.Add(turnoverInfo);
         }
 
+        public void AddSkipInfo(Nozzle nozzle)
+        {
+            SkipInfo si = new SkipInfo();
+            si.Index = nozzle.ToIndex;
+            si.Type = nozzle.ToType;
+            si.Message = "miss";
+            si.Floor = nozzle.FromFloor;
+            si.Cause = SkipCause.Error;
+            dischargeSkipInfoList.Add(si);
+        }
+
         /// <summary>
         /// 移除掉重码的任务
         /// </summary>
@@ -210,6 +228,7 @@ namespace Rs.MotionPlat.Flow
             infos.Instruction = EInstruction.LoadAndUnloadResult;
             infos.GroupID = m_schedulingMaterial.GroupID;
             infos.TurnoverID = m_schedulingMaterial.TurnoverID;
+            infos.SkipInfos = dischargeSkipInfoList;
             infos.Infos = turnoverResult;
             string content = JsonConvert.SerializeObject(infos, new StringEnumConverter());
             return content;
@@ -253,6 +272,7 @@ namespace Rs.MotionPlat.Flow
             infos.Instruction = EInstruction.LoadAndUnloadResult;
             infos.GroupID = m_schedulingMaterial.GroupID;
             infos.TurnoverID = m_schedulingMaterial.TurnoverID;
+            infos.SkipInfos = turnoverSkipInfoList;
             infos.Infos = turnoverInfos;
             string content = JsonConvert.SerializeObject(infos, new StringEnumConverter());
             return content;
@@ -426,6 +446,7 @@ namespace Rs.MotionPlat.Flow
                     if (taskMode == 0)
                     {
                         turnoverResult.Clear();
+                        dischargeSkipInfoList.Clear();
                         loadTaskList.Clear();
                         unloadTaskList.Clear();
                         changeTaskList.Clear();
@@ -434,6 +455,7 @@ namespace Rs.MotionPlat.Flow
                     {
                         testLoadTaskList.Clear();
                         testUnloadTaskList.Clear();
+                        turnoverSkipInfoList.Clear();
                     }
                 }
             }

Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs

@@ -1596,6 +1596,7 @@ namespace Rs.MotionPlat.Flow
                                     case ETipButton.Skip:
                                         if (!curNozzle.HasProduct())
                                         {
+                                            LoadAndUnloadTask.Instance.AddSkipInfo(curNozzle);
                                             curNozzle.Reset();
                                             curNozzle.VacSuction(EIoOperate.Close);
                                             curNozzle.VacBreak(EIoOperate.Open);
@@ -1872,6 +1873,7 @@ namespace Rs.MotionPlat.Flow
                                                 MessageQueue.Instance.Insert(logInfo);
                                                 if (!curNozzle.HasProduct())
                                                 {
+                                                    LoadAndUnloadTask.Instance.AddSkipInfo(curNozzle);
                                                     curNozzle.VacSuction(EIoOperate.Close);
                                                     curNozzle.Reset();
                                                     skip = true;
@@ -1956,6 +1958,7 @@ namespace Rs.MotionPlat.Flow
                                                         {
                                                             if (!UpCameraCheckFlow.Instance.CheckTurnoverTrayHasProduct(null, curNozzle.ToIndex + 1).HasProduct)
                                                             {
+                                                                LoadAndUnloadTask.Instance.AddSkipInfo(curNozzle);
                                                                 VacManager.TurnoverTrayVacSuction(EVacOperator.Close, true, curNozzle.ToIndex + 1);
                                                                 curNozzle.Reset();
                                                                 flowStep = EDischargeFlowStep.放料任务完成;
@@ -2004,6 +2007,7 @@ namespace Rs.MotionPlat.Flow
                                         MessageQueue.Instance.Insert(logInfo);
                                         if (!curNozzle.HasProduct())
                                         {
+                                            LoadAndUnloadTask.Instance.AddSkipInfo(curNozzle);
                                             curNozzle.VacSuction(EIoOperate.Close);
                                             curNozzle.Reset();
                                             skip = true;

Rs.SkyLine/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("3.20.24.53")]
+ [assembly: AssemblyVersion("3.20.24.54")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]