Merge repos.ubtob.net:usoft/mes-client

UAS_MES_HYSX/FunctionCode/Make/Make_ParseLog.cs

@@ -39,7 +39,9 @@ namespace UAS_MES_NEW.Make
 
         DataHelper dh;
         string currFileType = "", equiType = "";
+
         string ccdTestRes = "OK"; //两面都OK为OK,否则为NG
+        List<string> ccdNgFile = new List<string>();
 
         string SN, omakeCode, oMsid, oErrorMessage = "";
         List<string> fileList = new List<string>();
@@ -419,8 +421,9 @@ namespace UAS_MES_NEW.Make
                                 {
                                     SN = iName.Substring(3);
                                     ccdTestRes = ccdTestRes == "NG" ? "NG" : "NG";
+                                    ccdNgFile.Add(fileItem);
                                 }
-                                else if(iName.ToUpper().Contains("OK"))
+                                else
                                 {
                                     SN = iName.Substring(1);
                                     ccdTestRes = ccdTestRes == "NG" ? "NG" : "OK";
@@ -430,8 +433,9 @@ namespace UAS_MES_NEW.Make
                                 if (iName.ToUpper().Contains("NG"))
                                 {
                                     ccdTestRes = ccdTestRes == "NG" ? "NG" : "NG";
+                                    ccdNgFile.Add(fileItem);
                                 }
-                                else if (iName.ToUpper().Contains("OK"))
+                                else
                                 {
                                     ccdTestRes = ccdTestRes == "NG" ? "NG" : "OK";
                                 }
@@ -453,7 +457,7 @@ namespace UAS_MES_NEW.Make
                             Directory.CreateDirectory(changeName);
                         }
 
-                        string result = Path.GetFileName(file).Split('_')[0];
+                        /*string result = Path.GetFileName(file).Split('_')[0];
                         if (result.ToUpper().Contains("NG"))
                         {
                             if (UploadImageToFtp(file, SN))
@@ -461,27 +465,36 @@ namespace UAS_MES_NEW.Make
                                 dh.ExecuteSql($@"INSERT INTO steptestmain (sm_id, sm_sn,sm_makecode,sm_stepcode,sm_indate,sm_machinecode,sm_result) 
                                         VALUES (steptestmain_seq.NEXTVAL,'{SN}','{ma_code.Text}','{User.UserSourceCode}', sysdate,'CCD', 'http://192.168.1.5:8088/ftp/ccd/{SN}/{Path.GetFileName(file)}' )", "insert");
                             }
-                        }
+                        }*/
 
-                        if(Path.GetFileName(file).Split('_')[0].ToString() == "A") // 只有A面有序列号处理过站
+                        if (ccdTestRes == "NG") // 产品是否为NG
                         {
-                            if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                            foreach (var fileItem in ccdNgFile)
                             {
-                                if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "日志解析", "OK", User.UserCode, out oErrorMessage))
+                                if (UploadImageToFtp(file, SN)) // 上传NG面全部图片
                                 {
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, omakeCode, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", SN, "");
-                                    LogMessage(1, $"序列号: {SN} 已过站解析");
-                                }
-                                else
-                                {
-                                    LogMessage(0, $"序列号: {SN},处理过站NG:{oErrorMessage}");
+                                    dh.ExecuteSql($@"INSERT INTO steptestmain (sm_id, sm_sn,sm_makecode,sm_stepcode,sm_indate,sm_machinecode,sm_result) 
+                                        VALUES (steptestmain_seq.NEXTVAL,'{SN}','{ma_code.Text}','{User.UserSourceCode}', sysdate,'CCD', 'http://192.168.1.5:8088/ftp/ccd/{SN}/{Path.GetFileName(file)}' )", "insert");
                                 }
                             }
+                        }
+
+                        if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                        {
+                            if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "日志解析", "OK", User.UserCode, out oErrorMessage))
+                            {
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, omakeCode, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", SN, "");
+                                LogMessage(1, $"序列号: {SN} 已过站解析");
+                            }
                             else
                             {
-                                LogMessage(0, $"序列号: {SN},过站核对NG:{oErrorMessage}");
+                                LogMessage(0, $"序列号: {SN},处理过站NG:{oErrorMessage}");
                             }
                         }
+                        else
+                        {
+                            LogMessage(0, $"序列号: {SN},过站核对NG:{oErrorMessage}");
+                        }
 
                         string targetFile = Path.Combine(changeName, Path.GetFileName(file));
                         if (File.Exists(targetFile))