优化GRR时从哪个穴位取的还放到哪个穴位

Rs.DeweyTester/Entitys/TestProduct.cs

@@ -35,6 +35,8 @@ namespace Rs.MotionPlat.Entitys
 
         public string From { get; set; }
 
+        public int FromSlotIndex { get; set; }
+
 
         public void AddResult(int fixtureIndex,string result)
         {

Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs

@@ -350,11 +350,11 @@ namespace Rs.MotionPlat.Flow
                         {
                             takedNum++;
                             //curTakeNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
-                            curTakeNozzle.Product = new TestProduct() { SN = vProductResult.SN };
+                            curTakeNozzle.Product = new TestProduct() { SN = vProductResult.SN,FromSlotIndex=curTakeSlot.Index };
                             curTakeNozzle.Status = ENozzleStatus.ToTest;
                             GlobalTray.NozzleTray.ChangeStatus(curTakeNozzle.NozzleIndex, ESlotStatus.Have);
                             GlobalTray.GrrTray.ChangeStatus(curTakeSlot.Index, ESlotStatus.NotHave);
-                            logInfo = $"{GetClassName()}料仓取料完成真空检测OK,产品SN:{curTakeNozzle.Product.SN}被吸嘴{curTakeNozzle.NozzleIndex}取走";
+                            logInfo = $"{GetClassName()}料仓{curTakeSlot.Index}号穴位取料完成真空检测OK,产品SN:{curTakeNozzle.Product.SN}被吸嘴{curTakeNozzle.NozzleIndex}取走";
                             MessageQueue.Instance.Insert(logInfo);
                             if (NozzleManager.GetIdleNozzleCount() == 1 || takedNum == GlobalVar.GrrProductNum)
                             {
@@ -745,7 +745,8 @@ namespace Rs.MotionPlat.Flow
                         {
                             //吸嘴放料，加测吸嘴上的产品的测试结果，决定把料放到哪个料仓
                             //目前先都方到OK料仓
-                            curDumpSlot = GlobalTray.GrrTray.GetSlot(ESlotStatus.NotHave);
+                            //curDumpSlot = GlobalTray.GrrTray.GetSlot(ESlotStatus.NotHave);
+                            curDumpSlot = GlobalTray.GrrTray.GetSlot(curDumpNozzle.Product.FromSlotIndex);
                             if (curDumpSlot != null)
                             {