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

TeamAAS-VM/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.1")]
-[assembly: AssemblyFileVersion("1.3.0.1")]
+[assembly: AssemblyVersion("1.3.0.2")]
+[assembly: AssemblyFileVersion("1.3.0.2")]

TeamAAS-VM/Services/ProductService.cs

@@ -9,8 +9,10 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Documents;
+using System.Windows.Interop;
 using Team.FFFeederService.Interfaces;
 using TeamAAS_VP.Core;
+using TeamAAS_VP.Events;
 using TeamAAS_VP.Interfaces;
 using TeamAAS_VP.Models;
 using TeamAAS_VP.Models.Product;
@@ -566,15 +568,24 @@ namespace TeamAAS_VP.Services
             var dir = Path.GetDirectoryName(filePath);
             if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
 
+            string temp = string.Empty;
             // 加载每个相机的流程ToolBlock
-            foreach (var camera in p.CameraProcedures)
+            try
             {
-                foreach (var prc in camera.ProcedureModels)
+                foreach (var camera in p.CameraProcedures)
                 {
-                    string prcPath = Path.Combine(dir, camera.Camera, prc.Name + ".vpp");
-                    prc.ToolBlock = CogSerializer.LoadObjectFromFile(prcPath) as CogToolBlock;
+                    foreach (var prc in camera.ProcedureModels)
+                    {
+                        string prcPath = Path.Combine(dir, camera.Camera, prc.Name + ".vpp");
+                        temp = prcPath;
+                        prc.ToolBlock = CogSerializer.LoadObjectFromFile(prcPath) as CogToolBlock;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                LogHelper.logerror.Error($"加载产品视觉流程时出错！路径：{temp}", ex);
+            }
 
             return p;
         }