优化屏蔽穴位后把产品放回到input盘

Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs

@@ -939,7 +939,9 @@ namespace Rs.MotionPlat.Flow
                                         () =>
                                         {
                                             Task.Run(() => {
-                                                StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.AfterTakeTray, null);
+                                                StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.AfterTakeTray, () => {
+                                                    GlobalTray.GetTray(ETrayType.Input).ChangeStatus(ESlotStatus.NotHave);
+                                                });
                                             });
                                         });
                                     StockManager.Instance.GetStock(ETrayType.Input).WaitFinished();

Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs

@@ -390,15 +390,13 @@ namespace Rs.AutoDischarge.V3.Flow
                         {
                             if (Ops.IsOn($"{(int)m_stockType}号料仓料盘到位光电检测") || GlobalVar.VirtualAxis)
                             {
-                                loadFinishedEvent?.Invoke();
                                 Thread.Sleep(300);
                                 StockFlow.Stop();
                                 Thread.Sleep(200);
                                 Ops.On($"{(int)m_stockType}号料仓斜推气缸");
                                 Thread.Sleep(200);
                                 logInfo = GetClassName() + $"{(int)m_stockType}号料仓斜推气缸 on";
-                                finished = true;
+                                
-                                isRunning = false;
                                 if(loadMode!= EStockTrayLoadMode.AfterBacked)
                                     ChangeStatus(EStockTrayStatus.Loaded,true);
                                 else
@@ -407,6 +405,9 @@ namespace Rs.AutoDischarge.V3.Flow
                                 {
                                     siloFloor++;
                                 }
+                                loadFinishedEvent?.Invoke();
+                                finished = true;
+                                isRunning = false;
                                 logInfo = GetClassName()+ $"{GetTrayName()} 料仓上料盘完成";
                                 MessageQueue.Instance.Insert(logInfo);
                             }

Rs.SkyLine/Flow/SubFlow/NgTrayToInputTrayFlow.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Rs.MotionPlat.Flow.SubFlow
@@ -47,6 +48,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
                     });
                 });
             }
+
+            Thread.Sleep(5000);
             while (true)
             {
                 if(Ops.IsOff("4号料仓料盘到位光电检测"))//如果ng料仓处没有料盘

Rs.SkyLine/Flow/TestCenter.cs

@@ -5,6 +5,7 @@ using Rs.AutoDischarge.V3.Flow;
 using Rs.Controls;
 using Rs.Framework;
 using Rs.MotionPlat.Commom;
+using Rs.MotionPlat.Flow.SubFlow;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -124,6 +125,11 @@ namespace Rs.MotionPlat.Flow
                 }
                 switch (eInstructioneInstruction)
                 {
+                    case EInstruction.TransferSiloTray:
+                        //ReportToTestCenter(schedule);
+                        //MachineManage.Instance.SetLoadUnloadStatus(ERunState.Busying);
+                        //NgTrayToInputTrayFlow.Instance.MoveToInput();
+                        break;
                     case EInstruction.TestFinished:
                         MessageQueue.Instance.Insert("测试完成:"+JsonConvert.SerializeObject(schedule, new StringEnumConverter()));
                         ReportToTestCenter(schedule);