合并

TeamAAS-VM/Core/Management.cs

@@ -440,7 +440,7 @@ namespace TeamAAS_VP.Core
 
                 try
                 {
-                    Renders.Add(new ShowRender() { Id = item.Id, CameraName = item.CameraName });
+                    //Renders.Add(new ShowRender() { Id = item.Id, CameraName = item.CameraName });
                     _cameraService.CreateCamera(item.Id, item);
                     var camera = _cameraService.GetCamera(item.Id);
                     Status.Add(new StatusInfo(item.Id, item.CameraName + $"{Lang.未连接}", new SolidColorBrush(Colors.Red)));
@@ -471,7 +471,7 @@ namespace TeamAAS_VP.Core
                 }
 
             }
-            _container.Resolve<ShowVisionRenderViewModel>().Renders = Renders;
+            //_container.Resolve<ShowVisionRenderViewModel>().Renders = Renders;
 
             if (sb.Length == 0)
             {
@@ -1942,7 +1942,7 @@ namespace TeamAAS_VP.Core
                             }
                             catch (Exception ex)
                             {
-                                SendTaskMessage("CTQ数据存储时出错"+ex.Message, MessageLevel.Error);
+                                SendTaskMessage("CTQ数据存储时出错" + ex.Message, MessageLevel.Error);
                             }
                         }
                         else
@@ -2155,14 +2155,25 @@ namespace TeamAAS_VP.Core
                                     if (qrCodeResult && outputCollection.Contains("QR"))
                                     {
                                         code = outputCollection["QR"].Value as string;
-                                        SendTaskMessage($"二维码扫码成功:{code}", MessageLevel.Info);
-                                        await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)1);
+                                        if (!string.IsNullOrEmpty(code))
+                                        {
+                                            SendTaskMessage($"二维码扫码成功:{code}", MessageLevel.Info);
+                                            await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)1);
+                                        }
+                                        else
+                                        {
+                                            SendTaskMessage("二维码扫码失败", MessageLevel.Alarm);
+                                            await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)2);
+                                            await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                            return;
+                                        }
                                     }
                                     else
                                     {
                                         code = "";
                                         SendTaskMessage("二维码扫码失败", MessageLevel.Alarm);
                                         await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)2);
+                                        await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
                                         return;
                                     }
                                 }

TeamAAS-VM/Models/ShowRender.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using TeamAAS_VP.Enums;
+using TeamAAS_VP.Models.Product;
 
 namespace TeamAAS_VP.Models
 {
@@ -19,14 +20,6 @@ namespace TeamAAS_VP.Models
             set { SetProperty(ref _id, value); }
         }
 
-        private string _CameraName;
-
-        public string CameraName
-        {
-            get { return _CameraName; }
-            set { SetProperty(ref _CameraName, value); }
-        }
-
         private Cognex.VisionPro.ICogImage _Image;
 
         public Cognex.VisionPro.ICogImage Image
@@ -41,7 +34,7 @@ namespace TeamAAS_VP.Models
         public Cognex.VisionPro.CogGraphicCollection Graphic
         {
             get { return _Graphic; }
-            set { SetProperty(ref _Graphic,value); }
+            set { SetProperty(ref _Graphic, value); }
         }
 
         private Cognex.VisionPro.ICogRecord _Record;
@@ -57,7 +50,7 @@ namespace TeamAAS_VP.Models
         public bool Result
         {
             get { return _result; }
-            set { SetProperty(ref _result,value); }
+            set { SetProperty(ref _result, value); }
         }
 
         private bool _IsShow;
@@ -65,7 +58,7 @@ namespace TeamAAS_VP.Models
         public bool IsShow
         {
             get { return _IsShow; }
-            set { SetProperty(ref _IsShow,value); }
+            set { SetProperty(ref _IsShow, value); }
         }
 
         private bool _IsSaveImage;

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -1519,8 +1519,7 @@ namespace TeamAAS_VP.Services
                     }
                     _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                     {
-                        CameraName = procedure.CameraName,
-                        Id = procedure.CameraId,
+                        Id = procedure.Id,
                         Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
                         Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
                         Record = record,
@@ -1543,8 +1542,7 @@ namespace TeamAAS_VP.Services
                     outputCollection = null;
                     _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                     {
-                        CameraName = procedure.CameraName,
-                        Id = procedure.CameraId,
+                        Id = procedure.Id,
                         Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
                         Graphic = new CogGraphicCollection(),
                         Result = false,
@@ -1552,7 +1550,8 @@ namespace TeamAAS_VP.Services
                         IsSaveImage = procedure.IsSaveImage,
                         SaveImageModel = procedure.SaveImageModel,
                         SaveImagePathModel = procedure.SaveImagePathModel,
-                        SavePath = procedure.SavePath
+                        SavePath = procedure.SavePath,
+                        ProceductName = procedure.Name,
                     });
                     return false;
                 }
@@ -1618,18 +1617,18 @@ namespace TeamAAS_VP.Services
                     }
                     _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                     {
-                        CameraName = procedure.CameraName,
-                        Id = procedure.CameraId,
+                        Id = procedure.Id,
                         Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
+                        Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
                         Record = record,
                         Result = (bool)(outputCollection["Found"].Value),
                         IsShow = true,
-                        Graphic = new CogGraphicCollection(),
                         IsSaveImage = procedure.IsSaveImage,
                         SaveImageModel = procedure.SaveImageModel,
                         SaveImagePathModel = procedure.SaveImagePathModel,
                         SavePath = procedure.SavePath,
                         IsCompress = procedure.IsCompress,
+                        ProceductName = procedure.Name
                     });
                     SendTaskMessage($"{procedure.CameraName},{procedure.CameraId}", MessageLevel.Info);
                     return true;
@@ -1641,8 +1640,7 @@ namespace TeamAAS_VP.Services
                     outputCollection = null;
                     _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                     {
-                        CameraName = procedure.CameraName,
-                        Id = procedure.CameraId,
+                        Id = procedure.Id,
                         Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage"].Value,
                         Graphic = new CogGraphicCollection(),
                         Result = false,
@@ -1650,7 +1648,8 @@ namespace TeamAAS_VP.Services
                         IsSaveImage = procedure.IsSaveImage,
                         SaveImageModel = procedure.SaveImageModel,
                         SaveImagePathModel = procedure.SaveImagePathModel,
-                        SavePath = procedure.SavePath
+                        SavePath = procedure.SavePath,
+                        ProceductName = procedure.Name,
                     });
                     return false;
                 }

TeamAAS-VM/ViewModels/MainWindowViewModel.cs

@@ -32,6 +32,7 @@ using TeamAAS_VP.Interfaces;
 using TeamAAS_VP.Models;
 using TeamAAS_VP.Resources.Languages;
 using TeamAAS_VP.Services;
+using TeamAAS_VP.ViewModels.Home;
 using TeamAAS_VP.Views;
 using TeamAAS_VP.Views.User;
 using WPFLocalizeExtension.Engine;
@@ -372,9 +373,19 @@ namespace TeamAAS_VP.ViewModels
             Guid productid = _configService.GetSystemConfiguration().LastOpenedProductId;
             if (productid != Guid.Empty)
             {
-                _productService.LoadProduct(productid);
+                var res = _productService.LoadProduct(productid);
                 _productService.SetCurrentProduct(productid);
+
+                foreach (var item1 in res.CameraProcedures)
+                {
+                    foreach (var item2 in item1.ProcedureModels)
+                    {
+                        management.Renders.Add(new ShowRender() { Id = item2.Id, ProceductName = item2.Name });
+                    }
+                }
+                _container.Resolve<ShowVisionRenderViewModel>().Renders = management.Renders;
                 await management.WritePositionToPlcAsync();
+
             }
             var homeviewmodel = _container.Resolve<HomeViewModel>();
             homeviewmodel.OnNavigatedTo(null);