Kaynağa Gözat

修复拍一打一点位为null

KWD 7 ay önce
ebeveyn
işleme
791fa36f8d

+ 9 - 1
TeamAAS-VM/Core/Management.cs

@@ -1807,9 +1807,17 @@ namespace TeamAAS_VP.Core
                             //拍1打1 
                             if (systemConfig.WorkMode == 1)
                             {
-                                var point = currentProduct.ScrewPoints[positionIndex].Clone();
+                                var point=currentProduct.ScrewPoints.FirstOrDefault(p=>p.Number== positionIndex);
+                                if (point==null)
+                                {
+                                    SendTaskMessage($"点:{positionIndex}不存在", MessageLevel.Info);
+                                    await plc.WriteNodeAsync(addressConfig.Out_CameraDone.Address, (Int16)2);
+                                    return;
+                                }
+                                point = point.Clone();
                                 point.X_Position = UpCameraPutResults[1].X + DowmCameraResults[1].X;
                                 point.Y_Position = UpCameraPutResults[1].Y + DowmCameraResults[1].Y;
+                                SendTaskMessage($"点:{positionIndex},{point.X_Position:F3},{point.Y_Position:F4}", MessageLevel.Info);
                                 await point.WriteToPlcAddress(addressConfig.Out_Screw, plc);
                             }
                             //拍1打所有

+ 1 - 1
TeamAAS-VM/Models/PLC/PlcAddressConfig.cs

@@ -979,7 +979,7 @@ namespace TeamAAS_VP.Models.PLC
             In_MesCheck.Description = Lang.Mes交互1获取过站信息当站是否生产2上传本站数据;
 
             In_Result = Ensure(In_Result);
-            In_Result.Address = "ns=4;s=DB_Communication|ToPC.Mes[{0}].Result";
+            In_Result.Address = "ns=4;s=DB_Communication|ToPC.Mes[0].Product_Status";
             In_Result.DataType = "int16";
             In_Result.Description = "产品的最终结果,1:OK; 2:NG";
 

+ 2 - 2
TeamAAS-VM/Properties/AssemblyInfo.cs

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