dataToMes.Add($"LastResult{lockResult.Number}", $"{lastRes}");

添加一组螺丝结果，便于后端查询处理

TeamAAS-VM/Core/Management.cs

@@ -1257,7 +1257,7 @@ namespace TeamAAS_VP.Core
                     if (item.IsUse)
                     {
                         index++;
-                        await item.WriteToPlcAddress(addressConfig.Out_CheckCamera, plc,index);
+                        await item.WriteToPlcAddress(addressConfig.Out_CheckCamera, plc, index);
                     }
                 }
             }
@@ -1527,7 +1527,7 @@ namespace TeamAAS_VP.Core
                             }
 
                             //获取锁付拍照的点位
-                            var pos = plcPoints[cameraIndex-1];
+                            var pos = plcPoints[cameraIndex - 1];
                             if (pos != null)
                             {
                                 procedureId = pos.VisionProcessID;
@@ -1619,7 +1619,7 @@ namespace TeamAAS_VP.Core
                             //视觉流程ID
                             Guid procedureId = Guid.Empty;
                             //获取锁付拍照的点位
-                            var pos = plcPoints[cameraIndex-1];
+                            var pos = plcPoints[cameraIndex - 1];
                             if (pos != null)
                             {
                                 procedureId = pos.VisionProcessID;
@@ -1888,9 +1888,30 @@ namespace TeamAAS_VP.Core
                             //torqueList.Add($"{lockResult.Number}-{lockResult.LockTorque:F2}");
                             //pressureList.Add($"{lockResult.Number}-{lockResult.Pressure:F2}");
                             //turnList.Add($"{lockResult.Number}-{lockResult.LockTurns:F2}");
+                            //基于当前的锁付结果和产品的规格参数判断锁付结果是否合格
+                            var stationConfig = _configService.GetDeviceInfo(0);
+                            bool torqueRes = false, turnRes = false, pressureRes = false;
+                            int lastRes = 2;//默认不合格，只有当扭力、圈数、压力都在设定的上下限范围内时，才判定为锁付合格
+                            if (lockResult.LockTorque >= lockResult.TargetTorqueLowerLimit && lockResult.LockTorque <= lockResult.TargetTorqueUpperLimit)
+                            {
+                                torqueRes = true;
+                            }
+                            if (lockResult.Pressure >= stationConfig.DataInfo.CTQ_LSL_Pressure && lockResult.Pressure <= stationConfig.DataInfo.CTQ_USL_Pressure)
+                            {
+                                pressureRes = true;
+                            }
+                            if (lockResult.LockTurns >= lockResult.TargetTurnsLowerLimit && lockResult.LockTurns <= lockResult.TargetTurnsUpperLimit)
+                            {
+                                turnRes = true;
+                            }
+                            if (torqueRes == true && turnRes == true && pressureRes == true)//当扭力、圈数、压力都在设定的上下限范围内时，才判定为锁付合格
+                            {
+                                lastRes = 1;
+                            }
                             dataToMes.Add($"Torque{lockResult.Number}", $"{lockResult.LockTorque:F2}");
-                            dataToMes.Add($"Pressure{lockResult.Number}", $"{lockResult.Pressure:F2}");
                             dataToMes.Add($"Turn{lockResult.Number}", $"{lockResult.LockTurns:F2}");
+                            dataToMes.Add($"Pressure{lockResult.Number}", $"{lockResult.Pressure:F2}");
+                            dataToMes.Add($"LastResult{lockResult.Number}", $"{lastRes}");
                             SendTaskMessage($"螺丝序号:{lockResult.Number},扭力:{lockResult.LockTorque},压力:{lockResult.Pressure},圈数:{lockResult.LockTurns}", MessageLevel.Info);
 
                             lockResultsAll.Add(lockResult);
@@ -1939,7 +1960,7 @@ namespace TeamAAS_VP.Core
                             //拍1打1 
                             if (systemConfig.WorkMode == 1)
                             {
-                                List<PlcPoint> plcPoints = new List<PlcPoint>(); 
+                                List<PlcPoint> plcPoints = new List<PlcPoint>();
                                 foreach (var item in currentProduct.ScrewPoints)
                                 {
                                     if (item.IsUse)
@@ -1947,7 +1968,7 @@ namespace TeamAAS_VP.Core
                                         plcPoints.Add(item);
                                     }
                                 }
-                                var point = plcPoints[positionIndex-1];
+                                var point = plcPoints[positionIndex - 1];
                                 if (point == null)
                                 {
                                     SendTaskMessage($"点：{positionIndex}不存在", MessageLevel.Info);
@@ -3294,7 +3315,7 @@ namespace TeamAAS_VP.Core
         /// <param name="zipname">压缩后文件的名称</param>
         /// <param name="station">mes中的station</param>
         /// <param name="fixid">mes中的fixtureID</param>
-        public async void CompressionImage(string sourcePath, string zipname, string station,string fixid)
+        public async void CompressionImage(string sourcePath, string zipname, string station, string fixid)
         {
             string zipPath = "";
             try