优化aoi

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -357,26 +357,39 @@ namespace UAS_MES_NEW.Make
                     string[] currItem = item.Split(',');
                     string res = "";
                     /*List<NgData> data = new List<NgData>();*/
-                    if (currItem[1] != "PASS")
+                    if(equiType == "1")
                     {
-                        res = "NG";
-                        #region
-                        /*string[] NgArr = currItem[1].Split(';');
-                        foreach (var ngItem in NgArr)
+                        if (currItem[1] != "PASS")
                         {
-                            string[] ngItemArr = ngItem.Split('*');
-                            List<string> ngItemLocal = ngItemArr[1].Split('&').ToList();
-                            NgData ngData = new NgData { 
-                                Code = ngItemArr[0], 
-                                Local = ngItemLocal
-                            };
-                            data.Add(ngData);
-                        }*/
-                        #endregion
-                    }
-                    else
+                            res = "NG";
+                            #region
+                            /*string[] NgArr = currItem[1].Split(';');
+                            foreach (var ngItem in NgArr)
+                            {
+                                string[] ngItemArr = ngItem.Split('*');
+                                List<string> ngItemLocal = ngItemArr[1].Split('&').ToList();
+                                NgData ngData = new NgData { 
+                                    Code = ngItemArr[0], 
+                                    Local = ngItemLocal
+                                };
+                                data.Add(ngData);
+                            }*/
+                            #endregion
+                        }
+                        else
+                        {
+                            res = "PASS";
+                        }
+                    }else if (equiType == "2")
                     {
-                        res = "PASS";
+                        if (currItem[3] != "PASS")
+                        {
+                            res = "NG";
+                        }
+                        else
+                        {
+                            res = "PASS";
+                        }
                     }
                     Log itemLog = new Log()
                     {