1、下相机拍照Y方向统一为吸嘴1的Y拍照位

2、下相机定位拍照消除掉硬件差异

Rs.SkyLine/Commom/NozzleCollection.cs

@@ -1,4 +1,5 @@
 using NPOI.SS.Formula.Eval;
+using Rs.Controls;
 using Rs.DataAccess;
 using Rs.Framework;
 using Rs.MotionPlat.Flow;
@@ -314,5 +315,10 @@ namespace Rs.MotionPlat.Commom
         {
             return nozzles;
         }
+
+        public static double GetNozzleGrabOffsetY(int nozzleIndex)
+        {
+            return SysConfigParam.GetValue<double>($"Nozzle{nozzleIndex}CenterY") - SysConfigParam.GetValue<double>("Nozzle1CenterY");
+        }
     }
 }

Rs.SkyLine/Commom/VisionProcess.cs

@@ -76,11 +76,18 @@ namespace Rs.MotionPlat.Commom
             get
             {
                 if (LocationOk)
-                    return -1 * (Row - ModelRow) * GlobalVar.DownCameraMmPerPixel;
+                {
+                    double sourceOffsetY = (-1 * (Row - ModelRow) * GlobalVar.DownCameraMmPerPixel);
+                    double offsetY = NozzleManager.GetNozzleGrabOffsetY(NozzleIndex);
+                    //MessageQueue.Instance.Insert( $"吸嘴{NozzleIndex},补偿前:{sourceOffsetY},增加偏移量{offsetY},补偿后:{sourceOffsetY - offsetY}");
+                    return sourceOffsetY - offsetY;
+                } 
                 else
+                {
                     return 0;
                 } 
             }
+        }
 
         private double _OffsetCol;
 

Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs

@@ -813,7 +813,7 @@ namespace Rs.MotionPlat.Flow
                                     needGrabNum = NozzleManager.GetNozzlesByStatus(ENozzleStatus.ToUnload).Count();
                                     //targetX = SysConfigParam.GetValue<double>($"Nozzle{needGrabNum}CenterX") - 30;
                                     targetX = SysConfigParam.GetValue<double>($"Nozzle8CenterX") - 30;
-                                    targetY = SysConfigParam.GetValue<double>($"Nozzle8CenterY");
+                                    targetY = SysConfigParam.GetValue<double>($"Nozzle1CenterY");
                                     errCode = AxisControl.LoadX.MovePos(targetX, GlobalVar.WholeSpeed);
                                     if (errCode == ErrorCode.Ok || GlobalVar.VirtualAxis)
                                     {
@@ -1037,6 +1037,14 @@ namespace Rs.MotionPlat.Flow
                             //    NozzleManager.GetNozzle(ni).SN = item.SN;
                             //    ni++;
                             //}
+                            //foreach (MatchResult matchResult in mrs)
+                            //{
+                            //    if(matchResult.IsOK)
+                            //    {
+                                    
+                            //        matchResult.OffsetRow = matchResult.OffsetRow + offsetY;
+                            //    }
+                            //}
                             reGrabCount = 0;
                             OnMatchResult?.Invoke(mrs);
                             flowStep = EDischargeFlowStep.到放料位上方;