Merge branch 'AOI-3' of http://49.235.130.76/XXF_1122/DaisyNPILine into AOI-3

TeamAAS-VM/ViewModels/Product/VisionDynamicAccuracyAnalyzerViewModel.cs

@@ -1217,8 +1217,20 @@ namespace TeamAAS_VP.ViewModels.Product
                         //    return (false, _pixel_x, _pixel_y, _pixel_u, 0d, 0d);
                         //}
                         //eturn (true, _pixel_x, _pixel_y, _pixel_u, calibResult.X, calibResult.Y); ;
+                        if (!outputCollection.Contains("dis1"))
+                        {
+                            string[] Point1 = ((string)(outputCollection["Point"].Value)).Split(',');
+                            var calibration = _calibrationService.GetCalibration(SelectProcedure.CalibrationId);
+                            (bool IsSucceed, double X, double Y, double U) = _calibrationService.ConvertPixelToPosition((double.Parse(Point1[0]), double.Parse(Point1[1]), double.Parse(Point1[2])), null, calibration);
+                            if (!IsSucceed)
+                            {
+                                SendTaskMessage("坐标转换失败！");
+                            }
+                            return (true, double.Parse(Point1[0]), double.Parse(Point1[1]), double.Parse(Point1[2]), X, Y);
+                        }
                         double dis1 = (double)(outputCollection["dis1"].Value);
-                        return (true, dis1, 0, 0, 0, 0); ;
+
+                        return (true, dis1, 0, 0, 0, 0);
                     }
                     else
                     {