更改csv保存数据

TeamAAS-VM/Core/Management.cs

@@ -2681,11 +2681,11 @@ namespace TeamAAS_VP.Core
                                         PROCESS_OUTCOME = assyPress ? "Pass" : "Fail",
                                         PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                         CTQ_UNIT_OF_MEASURE = "mm",
-                                        ERROR_MESSAGE = assyPress ? "" : "CC OOS",
+                                        ERROR_MESSAGE = assyPress ? "NA" : "CC OOS",
                                         PD_ATTR_01 = ProductMainSN[i],
                                         PD_ATTR_02 = midValue,
                                         PD_ATTR_03 = PartSN,
-                                        PD_ATTR_04 = "NA",
+                                        PD_ATTR_04 = code,
                                         PD_ATTR_05 = "NA",
                                     });
                                     midValue = ((currentProduct.GlobalParamEx.CC2DownLimit + currentProduct.GlobalParamEx.CC2UpLimit) / 2).ToString("F3");
@@ -2708,11 +2708,11 @@ namespace TeamAAS_VP.Core
                                         PROCESS_OUTCOME = assyPress ? "Pass" : "Fail",
                                         PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                         CTQ_UNIT_OF_MEASURE = "mm",
-                                        ERROR_MESSAGE = assyPress ? "" : "CC OOS",
+                                        ERROR_MESSAGE = assyPress ? "NA" : "CC OOS",
                                         PD_ATTR_01 = ProductMainSN[i],
                                         PD_ATTR_02 = midValue,
                                         PD_ATTR_03 = PartSN,
-                                        PD_ATTR_04 = "NA",
+                                        PD_ATTR_04 = code,
                                         PD_ATTR_05 = "NA",
                                     });
                                     midValue = ((currentProduct.GlobalParamEx.DownPressure.PressureDownLimit + currentProduct.GlobalParamEx.DownPressure.PressureUpLimit) / 2).ToString("F3");
@@ -2735,11 +2735,11 @@ namespace TeamAAS_VP.Core
                                         PROCESS_OUTCOME = assyPress ? "Pass" : "Fail",
                                         PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                         CTQ_UNIT_OF_MEASURE = "kg",
-                                        ERROR_MESSAGE = assyPress ? "" : "Assy_Pressure OOS",
+                                        ERROR_MESSAGE = assyPress ? "NA" : "Assy_Pressure OOS",
                                         PD_ATTR_01 = ProductMainSN[i],
                                         PD_ATTR_02 = midValue,
                                         PD_ATTR_03 = PartSN,
-                                        PD_ATTR_04 = "NA",
+                                        PD_ATTR_04 = code,
                                         PD_ATTR_05 = "NA",
                                     });
                                     #endregion
@@ -2756,9 +2756,7 @@ namespace TeamAAS_VP.Core
                                         SendTaskMessage($"上传mes失败", MessageLevel.Error);
                                     }
 
-                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
-                                    LogHelper.WriteLogMes($"【mes结束ADD】");
-                                    SendTaskMessage($"mes结束ADD", MessageLevel.Info);
+                                    
 
                                     //是否保存当前的产品记录至CSV?
                                     if (stationConfig.SaveCsv)
@@ -2847,7 +2845,9 @@ namespace TeamAAS_VP.Core
                                     {
                                         SendTaskMessage($"{i}:{stationConfig.DeviceName}工位未配置保存产品记录", MessageLevel.Debug);
                                     }
-
+                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                    LogHelper.WriteLogMes($"【mes结束ADD】");
+                                    SendTaskMessage($"mes结束ADD", MessageLevel.Info);
                                     mes_cc.Clear();
                                     return;
                                 }

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -1872,7 +1872,7 @@ namespace TeamAAS_VP.Services
                     if (!outputCollection.Contains("Found"))
                     {
                         SendTaskMessage(Lang.未找到视觉输出结果, MessageLevel.Error);
-                        return (false, "");
+                        return (false, "NA");
                     }
 
                     // 2. 获取视觉输出结果
@@ -1891,12 +1891,12 @@ namespace TeamAAS_VP.Services
                     return (true, dis);
                 }
                 SendTaskMessage(Lang.多次拍照失败, MessageLevel.Alarm);
-                return (false, "dis");
+                return (false, "NA");
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogError("执行相机取图并获取单点位时出错！", ex);
-                return (false, "");
+                return (false, "NA");
             }
             finally
             {