From 8738dc318e6e4d6257eb84e880925c171f3597b3 Mon Sep 17 00:00:00 2001 From: lhiven Date: Tue, 19 Nov 2024 13:36:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=9B=9E?= =?UTF-8?q?=E5=A4=8Dendflow=E5=AF=BC=E8=87=B4=E9=87=8D=E6=B5=8B=E6=97=B6?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E8=B6=85=E6=97=B6=E5=90=8E=E6=89=8D=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=202=E3=80=81=E7=89=88=E6=9C=AC=E5=8F=B7:3.20.24.56?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/TestCenter.cs | 28 +++++++++++++++++---------- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs index a8ecf94..3e5d340 100644 --- a/Rs.SkyLine/Flow/TestCenter.cs +++ b/Rs.SkyLine/Flow/TestCenter.cs @@ -129,6 +129,7 @@ namespace Rs.MotionPlat.Flow switch (eInstructioneInstruction) { case EInstruction.EndFlow: + ReportToTestCenter(schedule); MessageQueue.Instance.Insert("收到中控停止命令:EndFlow,等待各个料盘就绪"); EndFlow(); break; @@ -530,44 +531,51 @@ namespace Rs.MotionPlat.Flow switch (inquireSilo.SiloType) { case SchedulingSiloBase.ESiloType.ToBeTested: - + //StockManager.Instance.GetStock(ETrayType.Input).ChangeStatus(EStockTrayStatus.Unloading, true); MessageQueue.Instance.Insert($"{ETrayType.Input}料仓收到切盘命令"); - //StockManager.Instance.GetStock(ETrayType.Input).Unload(EStockTrayUnLoadMode.Whole, null); - TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1, () => { - //StockManager.Instance.GetStock(ETrayType.Input).Status = EStockTrayStatus.Unloaded; - StockManager.Instance.GetStock(ETrayType.Input).ChangeStatus(EStockTrayStatus.Unloaded, true); - }, null, () => { - Task.Run(() => { - StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null); + //Task.Run(() => { + + //StockManager.Instance.GetStock(ETrayType.Input).Unload(EStockTrayUnLoadMode.Whole, null); + TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1, () => { + //StockManager.Instance.GetStock(ETrayType.Input).Status = EStockTrayStatus.Unloaded; + StockManager.Instance.GetStock(ETrayType.Input).ChangeStatus(EStockTrayStatus.Unloaded, true); + }, null, () => { + Task.Run(() => { + StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null); + }); }); - }); - + //}); break; case SchedulingSiloBase.ESiloType.Passed: + StockManager.Instance.GetStock(ETrayType.Ok).ChangeStatus(EStockTrayStatus.Unloading, true); Task.Run(() => { MessageQueue.Instance.Insert($"{ETrayType.Ok}料仓收到切盘命令"); StockManager.Instance.GetStock(ETrayType.Ok).Unload(EStockTrayUnLoadMode.Whole, null); }); break; case SchedulingSiloBase.ESiloType.Failed: + StockManager.Instance.GetStock(ETrayType.Ng).ChangeStatus(EStockTrayStatus.Unloading, true); Task.Run(() => { MessageQueue.Instance.Insert($"{ETrayType.Ng}料仓收到切盘命令"); StockManager.Instance.GetStock(ETrayType.Ng).Unload(EStockTrayUnLoadMode.Whole, null); }); break; case SchedulingSiloBase.ESiloType.Multifunction: + StockManager.Instance.GetStock(ETrayType.Multi).ChangeStatus(EStockTrayStatus.Unloading, true); Task.Run(() => { MessageQueue.Instance.Insert($"{ETrayType.Multi}料仓收到切盘命令"); StockManager.Instance.GetStock(ETrayType.Multi).Unload(EStockTrayUnLoadMode.Whole, null); }); break; case SchedulingSiloBase.ESiloType.EmptyInput: + StockManager.Instance.GetStock(ETrayType.Empty1).ChangeStatus(EStockTrayStatus.Unloading, true); Task.Run(() => { MessageQueue.Instance.Insert($"{ETrayType.Empty1}料仓收到切盘命令"); StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null); }); break; case SchedulingSiloBase.ESiloType.EmptyOutput: + StockManager.Instance.GetStock(ETrayType.Empty2).ChangeStatus(EStockTrayStatus.Unloading, true); Task.Run(() => { MessageQueue.Instance.Insert($"{ETrayType.Empty2}料仓收到切盘命令"); StockManager.Instance.GetStock(ETrayType.Empty2).Unload(EStockTrayUnLoadMode.Whole, null); diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 727abc8..80667d7 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.55")] + [assembly: AssemblyVersion("3.20.24.56")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]