Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Core/Management.cs

@@ -2451,40 +2451,7 @@ namespace TeamAAS_VP.Core
                                         string torque = string.Join(",", torqueList);
                                         string pressure = string.Join(",", pressureList);
                                         string turn = string.Join(",", turnList);
-                                        //
-                                        //try
-                                        //{
-                                        //    DateTime dt = DateTime.Now;
-                                        //    string filename = ProductMainSN[i] + "_" + dt.ToString("yyyyMMddHHmmss");
-                                        //    var device = _configService.GetDeviceInfo();
-                                        //    (bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN[i], filename);
-                                        //    if (isSuc)
-                                        //    {
-                                        //        LogHelper.WriteLogMes($"上传数据成功");
-                                        //        SendTaskMessage($"上传数据成功", MessageLevel.Debug);
-                                        //        string filePath = $"D:\\image\\Recored\\{dt.ToString("yyyy-MM")}\\{dt.ToString("MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
-                                        //        //复制csv
-                                        //        string source_csv = $"{stationConfig.SaveCsvPath}\\{dt.ToString("yyyy-MM")}\\{i}_{stationConfig.DataInfo.PROCESS_NAME}_{dt.ToString("yyyy-MM-dd")}.csv";
-                                        //        string target_csv = Path.Combine(filePath, Path.GetFileName(source_csv)); ;
-                                        //        File.Copy(source_csv, target_csv, true);
-                                        //        //复制log
-                                        //        string source_log = $"..\\Log\\LogInfo\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}.txt";
-                                        //        string target_log = Path.Combine(filePath, Path.GetFileName(source_log));
-                                        //        File.Copy(source_log, target_log, true);
-                                        //        CompressionImage(filePath, filename, device.FixtureId);
-                                        //    }
-                                        //    else
-                                        //    {
-                                        //        LogHelper.WriteLogMes($"上传数据失败");
-                                        //        SendTaskMessage($"上传数据失败", MessageLevel.Error);
-                                        //    }
-                                        //}
-                                        //catch (Exception ex)
-                                        //{
-                                        //    SendTaskMessage($"上传数据时出错:{ex.Message}", MessageLevel.Error);
-                                        //    LogHelper.WriteLogError($"上传数据时出错", ex);
-                                        //}
-                                        //
+                                        
                                         //这里现在上传的结果都是锁付站的，如果存在其他附属站的数据需要上传时，将不适用，要根据实际情况进行调整
                                         (bool isSuccess, string response) = await _mesService.SubmitGetAsync(ProductMainSN[i], "", torque, pressure, turn, resultIndex == 1 ? true : false, _LastMesCheckTime[i], serverTimeResult.Now);
                                         if (isSuccess)
@@ -2542,7 +2509,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = torqueRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = torqueRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "kgf.cm",
                                                             ERROR_MESSAGE = torqueRes ? "" : "Torque_Spec OOS"
@@ -2563,7 +2530,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = turnRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = turnRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "圈",
                                                             ERROR_MESSAGE = turnRes ? "" : "Turn_Spec OOS"
@@ -2584,7 +2551,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = pressureRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "N",
                                                             ERROR_MESSAGE = pressureRes ? "" : "Pressure_Spec OOS"
@@ -2599,7 +2566,7 @@ namespace TeamAAS_VP.Core
                                                     try
                                                     {
                                                         DateTime dt = DateTime.Now;
-                                                        string filename = ProductMainSN[i] + "_" + dt.ToString("yyyyMMddHHmmss");
+                                                        string filename = $"{currentProduct.Name}_{dt.ToString("yyyyMMdd")}_{ProductMainSN[i]}_{dt.ToString("yyyyMMddHHmmss")}";
                                                         var device = _configService.GetDeviceInfo();
                                                         (bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN[i], filename);
                                                         if (isSuc)

TeamAAS-VM/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.3")]
-[assembly: AssemblyFileVersion("1.3.0.3")]
+[assembly: AssemblyVersion("1.3.0.2")]
+[assembly: AssemblyFileVersion("1.3.0.2")]

TeamAAS-VM/Services/MesService.cs

@@ -475,8 +475,8 @@ namespace TeamAAS_VP.Services
                 }
             }
 
-            //string res = isSuccess ? "PASS" : "FAIL";
-            string res = "PASS";
+            //string res = isSuccess ? "Pass" : "Fail";
+            string res = "Pass";
             string url = "";
             if (device.F == "PTL")
             {
@@ -568,8 +568,8 @@ namespace TeamAAS_VP.Services
                 }
             }
 
-            //string res = isSuccess ? "PASS" : "FAIL";
-            string res = "PASS";
+            //string res = isSuccess ? "Pass" : "Fail";
+            string res = "Pass";
             string url = "";
             if (device.F == "PTL")
             {
@@ -745,7 +745,7 @@ namespace TeamAAS_VP.Services
                         LogHelper.WriteLogMes($"【上传LogData的HTTP接收】{text}");
                         SendTaskMessage($"【上传LogData的HTTP接收】{text}", MessageLevel.Info);
                         // "SFC_OK" 代表和 MES 连接成功
-                        if (text.Contains("SFC_OK"))
+                        if (text.Contains("\"Code\":1"))
                         {
                             return (true, text);
                         }

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -1887,8 +1887,6 @@ namespace TeamAAS_VP.Services
 
                     SendTaskMessage(Lang.拍照OK, MessageLevel.Debug);
 
-
-
                     if (procedure.CalibrationId == Guid.Empty)
                     {
                         //没有关联校准时，则执行检测任务