Merge branch 'LCD组装' of http://49.235.130.76/XXF_1122/DaisyNPILine into LCD组装

TeamAAS-VM/Core/Management.cs

@@ -2986,11 +2986,11 @@ namespace TeamAAS_VP.Core
                                                 PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                 CTQ_UNIT_OF_MEASURE = "mm",
                                                 ERROR_MESSAGE = "NA",
-                                                PD_ATTR_01 = ProductMainSN[i],
-                                                PD_ATTR_02 = midValue,
+                                                PD_ATTR_01 = midValue,
+                                                PD_ATTR_02 = ProductMainSN[i],
                                                 PD_ATTR_03 = PartSN,
-                                                PD_ATTR_04 = "NA",
-                                                PD_ATTR_05 = "NA",
+                                                PD_ATTR_04 = code,
+                                                PD_ATTR_05 = "",
                                             });
                                         }
 
@@ -3014,12 +3014,12 @@ 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",
-                                            PD_ATTR_01 = ProductMainSN[i],
-                                            PD_ATTR_02 = midValue,
+                                            ERROR_MESSAGE = assyPresRes ? "NA" : "Assy_Pressure OOS",
+                                            PD_ATTR_01 = midValue,
+                                            PD_ATTR_02 = ProductMainSN[i],
                                             PD_ATTR_03 = PartSN,
-                                            PD_ATTR_04 = "NA",
-                                            PD_ATTR_05 = "NA",
+                                            PD_ATTR_04 = code,
+                                            PD_ATTR_05 = "",
                                         });
                                         #endregion
                                     }
@@ -3076,12 +3076,12 @@ 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",
-                                            PD_ATTR_01 = ProductMainSN[i],
-                                            PD_ATTR_02 = midValue,
-                                            PD_ATTR_03 = "NA",
-                                            PD_ATTR_04 = "NA",
-                                            PD_ATTR_05 = "NA",
+                                            ERROR_MESSAGE = presRes ? "NA" : "Pressure OOS",
+                                            PD_ATTR_01 = midValue,
+                                            PD_ATTR_02 = ProductMainSN[i],
+                                            PD_ATTR_03 = "",
+                                            PD_ATTR_04 = code,
+                                            PD_ATTR_05 = "",
                                         });
                                         midValue = ((currentProduct.GlobalParamEx.DownPressure.PressureTime + currentProduct.GlobalParamEx.DownPressure.PressureTime) / 2).ToString("F3");
                                         DFC.Add(new DataFormCtq
@@ -3104,16 +3104,16 @@ namespace TeamAAS_VP.Core
                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                             CTQ_UNIT_OF_MEASURE = "s",
                                             ERROR_MESSAGE = "NA",
-                                            PD_ATTR_01 = ProductMainSN[i],
-                                            PD_ATTR_02 = midValue,
-                                            PD_ATTR_03 = "NA",
-                                            PD_ATTR_04 = "NA",
-                                            PD_ATTR_05 = "NA",
+                                            PD_ATTR_01 = midValue,
+                                            PD_ATTR_02 = ProductMainSN[i],
+                                            PD_ATTR_03 = "",
+                                            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成功");
@@ -3124,7 +3124,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)
@@ -3216,7 +3216,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,7 +1999,7 @@ namespace TeamAAS_VP.Services
             await SetLightBeforePhoto(procedure);
             try
             {
-                string dis = "";
+                var dis = "";
                 //拍照失败时，需要多次拍照
                 for (int i = 0; i < procedure.FeederFailLimit; i++)
                 {
@@ -2016,7 +2016,7 @@ namespace TeamAAS_VP.Services
                     if (!outputCollection.Contains("Found"))
                     {
                         SendTaskMessage(Lang.未找到视觉输出结果, MessageLevel.Error);
-                        return (false, "");
+                        return (false, "NA");
                     }
 
                     // 2. 获取视觉输出结果
@@ -2035,12 +2035,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
             {