增加压力不合格log显示

TeamAAS-VM/Core/Management.cs

@@ -2030,6 +2030,7 @@ namespace TeamAAS_VP.Core
                             }
                             if (lockResult.Pressure >= stationConfig.DataInfo.CTQ_LSL_Pressure && lockResult.Pressure <= stationConfig.DataInfo.CTQ_USL_Pressure)
                             {
+                                SendTaskMessage($"Screw{lockResult.Number}:压力不合格", MessageLevel.Error);
                                 pressureRes = true;
                             }
                             if (lockResult.LockTurns >= lockResult.TargetTurnsLowerLimit && lockResult.LockTurns <= lockResult.TargetTurnsUpperLimit)
@@ -2425,23 +2426,19 @@ namespace TeamAAS_VP.Core
                                                 if (val)
                                                 {
                                                     SendTaskMessage($"是当站螺丝:{code}", MessageLevel.Info);
-                                                    await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)1);
                                                 }
                                                 else
                                                 {
                                                     SendTaskMessage($"不是当站螺丝:{code}", MessageLevel.Info);
-                                                    await plc.WriteNodeAsync(addressConfig.Out_QrCodePhotoResault.Address, (Int16)2);
                                                     await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
                                                     return;
                                                 }
                                             }
                                             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;
                                         }
@@ -2450,7 +2447,6 @@ namespace TeamAAS_VP.Core
                                     {
                                         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;
                                     }
@@ -2706,7 +2702,14 @@ namespace TeamAAS_VP.Core
 
                                                     //产品发生改变并且供料器发生了变化时，需要通知PLC进行取料更改
                                                     await plc.WriteNodeAsync(addressConfig.Out_ScrewFeederIsChanged.Address, (Int16)1); //不发生改变
-                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                    if (models)
+                                                    {
+                                                        await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                                    }
+                                                    else
+                                                    {
+                                                        await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                    }
                                                 }
                                             }
                                             else
@@ -2716,7 +2719,14 @@ namespace TeamAAS_VP.Core
 
                                                 //产品发生改变并且供料器发生了变化时，需要通知PLC进行取料更改
                                                 await plc.WriteNodeAsync(addressConfig.Out_ScrewFeederIsChanged.Address, (Int16)1); //不发生改变
-                                                await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                if (models)
+                                                {
+                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                                }
+                                                else
+                                                {
+                                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)2);
+                                                }
                                             }
                                         }
                                         LogHelper.WriteLogMes($"【mes结束QUERY】");
@@ -2847,7 +2857,7 @@ namespace TeamAAS_VP.Core
                                                 MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                 PROCESS_OUTCOME = turnRes ? "PASS" : "FAIL",
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
-                                                CTQ_UNIT_OF_MEASURE = "圈",
+                                                CTQ_UNIT_OF_MEASURE = "Turn",
                                                 ERROR_MESSAGE = turnRes ? "NA" : "Turn_Spec OOS",
                                                 PD_ATTR_01 = ProductMainSN[i],
                                                 PD_ATTR_02 = midValue,
@@ -2875,7 +2885,7 @@ namespace TeamAAS_VP.Core
                                                 MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
                                                 PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
-                                                CTQ_UNIT_OF_MEASURE = "N",
+                                                CTQ_UNIT_OF_MEASURE = "kg",
                                                 ERROR_MESSAGE = pressureRes ? "NA" : "Pressure_Spec OOS",
                                                 PD_ATTR_01 = ProductMainSN[i],
                                                 PD_ATTR_02 = midValue,