1、修复未回复endflow导致重测时等待超时后才开始

2、版本号:3.20.24.56

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);
+                        //Task.Run(() => {
-                        TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1, () => {
+                           
-                            //StockManager.Instance.GetStock(ETrayType.Input).Status = EStockTrayStatus.Unloaded;
+                            //StockManager.Instance.GetStock(ETrayType.Input).Unload(EStockTrayUnLoadMode.Whole, null);
-                            StockManager.Instance.GetStock(ETrayType.Input).ChangeStatus(EStockTrayStatus.Unloaded, true);
+                            TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty1, () => {
-                        }, null, () => {
+                                //StockManager.Instance.GetStock(ETrayType.Input).Status = EStockTrayStatus.Unloaded;
-                            Task.Run(() => {
+                                StockManager.Instance.GetStock(ETrayType.Input).ChangeStatus(EStockTrayStatus.Unloaded, true);
-                                StockManager.Instance.GetStock(ETrayType.Empty1).Unload(EStockTrayUnLoadMode.Whole, null);
+                            }, 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);

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")]