更改csv保存数据

TeamAAS-VM/Core/Management.cs

@@ -2976,11 +2976,11 @@ namespace TeamAAS_VP.Core
                                                 PROCESS_OUTCOME = "Pass",
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                 CTQ_UNIT_OF_MEASURE = "mm",
-                                                ERROR_MESSAGE = "",
+                                                ERROR_MESSAGE = "NA",
                                                 PD_ATTR_01 = midValue,
                                                 PD_ATTR_02 = ProductMainSN[i],
                                                 PD_ATTR_03 = PartSN,
-                                                PD_ATTR_04 = "",
+                                                PD_ATTR_04 = code,
                                                 PD_ATTR_05 = "",
                                             });
                                         }
@@ -3005,11 +3005,11 @@ namespace TeamAAS_VP.Core
                                             PROCESS_OUTCOME = assyPresRes ? "Pass" : "Fail",
                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                             CTQ_UNIT_OF_MEASURE = "kg",
-                                            ERROR_MESSAGE = assyPresRes ? "" : "Assy_Pressure OOS",
+                                            ERROR_MESSAGE = assyPresRes ? "NA" : "Assy_Pressure OOS",
                                             PD_ATTR_01 = midValue,
                                             PD_ATTR_02 = ProductMainSN[i],
                                             PD_ATTR_03 = PartSN,
-                                            PD_ATTR_04 = "",
+                                            PD_ATTR_04 = code,
                                             PD_ATTR_05 = "",
                                         });
                                         #endregion
@@ -3067,11 +3067,11 @@ namespace TeamAAS_VP.Core
                                             PROCESS_OUTCOME = presRes ? "Pass" : "Fail",
                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                             CTQ_UNIT_OF_MEASURE = "kg",
-                                            ERROR_MESSAGE = presRes ? "" : "Pressure OOS",
+                                            ERROR_MESSAGE = presRes ? "NA" : "Pressure OOS",
                                             PD_ATTR_01 = midValue,
                                             PD_ATTR_02 = ProductMainSN[i],
                                             PD_ATTR_03 = "",
-                                            PD_ATTR_04 = "",
+                                            PD_ATTR_04 = code,
                                             PD_ATTR_05 = "",
                                         });
                                         midValue = ((currentProduct.GlobalParamEx.DownPressure.PressureTime + currentProduct.GlobalParamEx.DownPressure.PressureTime) / 2).ToString("F3");
@@ -3094,17 +3094,17 @@ namespace TeamAAS_VP.Core
                                             PROCESS_OUTCOME = "Pass",
                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                             CTQ_UNIT_OF_MEASURE = "s",
-                                            ERROR_MESSAGE = "",
+                                            ERROR_MESSAGE = "NA",
                                             PD_ATTR_01 = midValue,
                                             PD_ATTR_02 = ProductMainSN[i],
                                             PD_ATTR_03 = "",
-                                            PD_ATTR_04 = "",
+                                            PD_ATTR_04 = code,
                                             PD_ATTR_05 = "",
                                         });
                                         #endregion
                                     }
                                     //gap-复检gap参数, press-保压站实际压力值, presstime-保压站保压时间, assypress-组装站实际压力值
-                                    (bool isSuccess, string response) = await _mesService.SubmitGetAsync(i, code, comp, resultIndex == 1 ? true : false, data, _LastMesCheckTime[i], serverTimeResult.Now);
+                                    (bool isSuccess, string response) = await _mesService.SubmitGetAsync(i, ProductMainSN[i], comp, resultIndex == 1 ? true : false, data, _LastMesCheckTime[i], serverTimeResult.Now);
                                     if (!stationConfig.EnableMES || isSuccess)
                                     {
                                         LogHelper.WriteLogMes($"上传mes成功");
@@ -3115,7 +3115,7 @@ namespace TeamAAS_VP.Core
                                         LogHelper.WriteLogMes($"上传mes失败");
                                         SendTaskMessage($"上传mes失败", MessageLevel.Error);
                                     }
-                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
+                                   
 
                                     //是否保存当前的产品记录至CSV?
                                     if (stationConfig.SaveCsv)
@@ -3186,7 +3186,7 @@ namespace TeamAAS_VP.Core
                                     }
                                     LogHelper.WriteLogMes($"【mes结束ADD】");
                                     SendTaskMessage($"mes结束ADD", MessageLevel.Info);
-
+                                    await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
                                     return;
                                 }
                                 else

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -1999,6 +1999,7 @@ namespace TeamAAS_VP.Services
             await SetLightBeforePhoto(procedure);
             try
             {
+                var dis = "";
                 //拍照失败时，需要多次拍照
                 for (int i = 0; i < procedure.FeederFailLimit; i++)
                 {
@@ -2015,7 +2016,7 @@ namespace TeamAAS_VP.Services
                     if (!outputCollection.Contains("Found"))
                     {
                         SendTaskMessage(Lang.未找到视觉输出结果, MessageLevel.Error);
-                        return (false, "");
+                        return (false, "NA");
                     }
 
                     // 2. 获取视觉输出结果
@@ -2023,22 +2024,23 @@ namespace TeamAAS_VP.Services
                     if (!Found)
                     {
                         SendTaskMessage(Lang.拍照NG, MessageLevel.Debug);
+                        dis = (string)(outputCollection["Gap"].Value);
                         continue;
                     }
 
                     SendTaskMessage(Lang.拍照OK, MessageLevel.Debug);
 
                     LogHelper.WriteLogInfo("开始获取视觉输出结果");
-                    string dis = (string)(outputCollection["Gap"].Value);
+                     dis = (string)(outputCollection["Gap"].Value);
                     return (true, dis);
                 }
                 SendTaskMessage(Lang.多次拍照失败, MessageLevel.Alarm);
-                return (false, "");
+                return (false, "NA");
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogError("执行相机取图并获取单点位时出错！", ex);
-                return (false, "");
+                return (false, "NA");
             }
             finally
             {