From 4e30e0ade74bbde972ed541c2725fdda868fa6d1 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sun, 23 Jun 2024 16:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96GRR=E6=97=B6=E4=BB=8E?=
 =?UTF-8?q?=E5=93=AA=E4=B8=AA=E7=A9=B4=E4=BD=8D=E5=8F=96=E7=9A=84=E8=BF=98?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=93=AA=E4=B8=AA=E7=A9=B4=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.DeweyTester/Entitys/TestProduct.cs     | 2 ++
 Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Rs.DeweyTester/Entitys/TestProduct.cs b/Rs.DeweyTester/Entitys/TestProduct.cs
index 952186c..539da3f 100644
--- a/Rs.DeweyTester/Entitys/TestProduct.cs
+++ b/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)
         {
diff --git a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs
index 808105a..10a385d 100644
--- a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs
+++ b/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)
                             {