螺丝锁付NG上传带FixtureId号

TeamAAS-VM/Core/Management.cs

@@ -1,5 +1,6 @@
 using Cognex.VisionPro.ToolBlock;
 using MahApps.Metro.Controls;
+using MvCamCtrl.NET;
 using NPOI.OpenXmlFormats.Vml;
 using Opc.Ua;
 using Org.BouncyCastle.Crypto;
@@ -1626,6 +1627,7 @@ namespace TeamAAS_VP.Core
 
                         if (state)
                         {
+                            var device = _configService.GetDeviceInfo();
                             SendTaskMessage(Lang.触发上相机锁附组装拍照, MessageLevel.Debug);
                             //相机的编号
                             Int16 cameraIndex = plc.ReadNode<Int16>(addressConfig.In_UpCameraPutNum.Address);
@@ -1743,7 +1745,7 @@ namespace TeamAAS_VP.Core
 
                                 if (!resultToMes.Contains($"Screw{cameraIndex}_Fail"))
                                 {
-                                    resultToMes.Add($"Screw{cameraIndex}_Fail");
+                                    resultToMes.Add($"{device.FixtureId}_Screw{cameraIndex}_Fail");
                                     SendTaskMessage($"Screw{cameraIndex}:拍照失败", MessageLevel.Error);
                                 }
 
@@ -2268,11 +2270,12 @@ namespace TeamAAS_VP.Core
                             {
 
                             }
+                            var device = _configService.GetDeviceInfo();
                             SendTaskMessage(Lang.收到停止锁付信号, MessageLevel.Debug);
                             //位置编号
                             Int16 positionIndex = plc.ReadNode<Int16>(addressConfig.In_ProductNum.Address);
                             SendTaskMessage(string.Format(Lang.编号0, positionIndex), MessageLevel.Info);
-
+                          
                             //获取当前锁付点
                             var screwPoint = currentProduct.ScrewPoints.FirstOrDefault(p => p.Number == positionIndex);
                             //获取当前的机器人点位
@@ -2393,7 +2396,7 @@ namespace TeamAAS_VP.Core
                             {
                                 if (!resultToMes.Contains($"Screw{lockResult.Number}_Fail"))
                                 {
-                                    resultToMes.Add($"Screw{lockResult.Number}_Fail");
+                                    resultToMes.Add($"{device.FixtureId}_Screw{lockResult.Number}_Fail");
                                     SendTaskMessage($"Screw{lockResult.Number}:锁附不合格", MessageLevel.Error);
                                 }
                             }