From 397650075edceb09f6eebfb722c751ea65fce571 Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 12 Nov 2024 17:03:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=813.20.24.54=202=E3=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B7=B3=E8=BF=87=E4=BF=A1=E6=81=AF=E7=BB=99=E4=B8=AD?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/LoadAndUnloadTask.cs | 24 ++++++++++++++++++++- Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 4 ++++ Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs index 0469e71..db67477 100644 --- a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs +++ b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs @@ -87,7 +87,14 @@ namespace Rs.MotionPlat.Flow #endregion List turnoverResult = new List(); - + /// + /// 排料跳过信息列表 + /// + List dischargeSkipInfoList = new List(); + /// + /// 周转跳过信息 + /// + List turnoverSkipInfoList = new List(); 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); + } + /// /// 移除掉重码的任务 /// @@ -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(); } } } diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 51d5638..18b76e8 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/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; diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index eb973fb..68bbb8e 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.53")] + [assembly: AssemblyVersion("3.20.24.54")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]