修复警报数据问题、回写plc提醒

MainForm/FaForm/Form_Home.cs

@@ -3309,7 +3309,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -3743,7 +3747,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -4350,7 +4358,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -4813,7 +4825,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -6467,7 +6483,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -6680,7 +6700,6 @@ namespace MainForm
                                             tagBaseName + "." + tagMesCommName, stationCode, stationName,
                                             out ProgressState));
                                         stPLC_MesData.mesCommFrmPLC.cmd = 0;
-                                        uuid = "";
                                     }
                                 }
                             }
@@ -6938,7 +6957,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();
@@ -6984,6 +7007,7 @@ namespace MainForm
                 stationNameStr + "_出站接口;总用时" + stopwatch1.ElapsedMilliseconds + "ms;写入用时" +
                 stopwatch2.ElapsedMilliseconds + "ms");
             ProgressState = false;
+            uuid = "";
         }
 
         #endregion
@@ -7359,7 +7383,11 @@ namespace MainForm
                 if (mesResultFrmWeb == 1)
                 {
                     mesResultFrmWeb = (byte)(a1Result == 1 ? 1 : 110); //检测NG
-                    AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+                    if (mesResultFrmWeb == 110)
+                    {
+                        AddMessage(LogType.Info, stationNameStr + "_出站PLC检测结果:FAIL");
+
+                    }
                 }
 
                 stopwatch2.Start();

MainForm/FaForm/Form_Home_SaveData.cs

@@ -778,7 +778,7 @@ namespace MainForm
                     if (deviceState == XiaomiDeviceState.Fault || deviceState == XiaomiDeviceState.Alarm)
                     {
                         request.fault_code = AlarmStateCode;  // 对应的故障编码
-                        request.fault_tm = AlarmStateName;      // 故障发⽣时间(需要实际的发生时间)
+                        request.fault_tm = dtNow.ToString("yyyy-MM-dd HH:mm:ss.fff");      // 故障发⽣时间(需要实际的发生时间)
                     }
                     // 上传
                     (int, string) iotResult = XiaomiMqttClient_Extend.Write_DeviceStateData(request);
@@ -848,8 +848,8 @@ namespace MainForm
                     string sql = alarmData.ToStringInsert();
                     SQLHelper_New.ExecuteSQL(sql, null);
                     //OnMessage(LogType.Info, "【报警日志】发生了报警[" + alarmData.LineName + "-" + alarmData.AlarmDesc + "]！");
-                    Form_Home.AlarmStateCode= alarmData.AlarmDesc;
-                    Form_Home.AlarmStateName = alarmData.AlarmType;
+                    Form_Home.AlarmStateCode= alarmData.AlarmType;
+                    Form_Home.AlarmStateName = alarmData.AlarmDesc;
 
                     FaultLogRequest request = new FaultLogRequest();
                     request.station = stationId;   // ⼯位