SPI归属工单和AOI过站问题

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -855,42 +855,38 @@ namespace UAS_MES_NEW.Make
                 {
                     if (string.IsNullOrEmpty(item)) continue;
                     string[] currItem = item.Split(',');
-                    string res = "",wo = "",lineName = "",source = "";
+                    string res = "",wo = "",detail = "";
                     if(equiType == "SPI")
                     {
                         res = currItem[1];
                         wo = ma_code.Text;
-                        source = User.UserSourceCode;
-                        lineName = User.UserLineCode;
+                        detail = currItem[1];
                     }
                     else if (equiType == "AOI")
                     {
-                        res = currItem[3];
-
-                        sql.Clear();
-                        //sql.Append($"SELECT a.li_code,b.dl_macode FROM line_ipaoi a, deviceline b WHERE a.ipaddress = '{currItem[2]}' AND a.li_code = b.dl_linecode");
-                        sql.Append($"SELECT a.li_code,b.dl_macode,c.sc_name FROM line_ipaoi a,deviceline b,source c WHERE a.ipaddress = '{currItem[2]}' AND a.li_code = b.dl_linecode AND a.li_code = c.sc_linecode AND c.sc_wccode = 'SMT' AND instr(c.sc_name, 'AOI') > 0 AND b.dl_type = 'SMT'");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        if (dt.Rows.Count > 0 && !String.IsNullOrEmpty(dt.Rows[0]["dl_macode"].ToString()))
-                        {
-                            wo = dt.Rows[0]["dl_macode"].ToString();
-                            lineName = dt.Rows[0]["li_code"].ToString();
-                            source = dt.Rows[0]["sc_name"].ToString();
-                        }
-                        else
+                        res = currItem[1];
+                        detail = currItem[1];
+                        if (currItem.Length > 3)
                         {
-                            LogMessage($"IP:{currItem[2]},无对应线体工单");
-                            return;
+                            sql.Clear();
+                            sql.Append($"SELECT a.li_code,b.dl_macode,c.sc_name FROM line_ipaoi a,deviceline b,source c WHERE a.ipaddress = '{currItem[2]}' AND a.li_code = b.dl_linecode AND a.li_code = c.sc_linecode AND c.sc_wccode = 'SMT' AND instr(c.sc_name, 'AOI') > 0 AND b.dl_type = 'SMT'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            if (dt.Rows.Count > 0 && !String.IsNullOrEmpty(dt.Rows[0]["dl_macode"].ToString()))
+                            {
+                                wo = dt.Rows[0]["dl_macode"].ToString();
+                            }
+                            res = currItem[3];
+                            detail = currItem[3];
                         }
                     }
                     Log itemLog = new Log()
                     {
                         SN = currItem[0],
                         Work_order = wo,
-                        Line = lineName,
-                        Source = source,
+                        Line = User.UserLineCode,
+                        Source = User.UserSourceCode,
                         Result = res,
-                        Details = equiType == "SPI" ? currItem[1] : currItem[3]
+                        Details = detail
                     };
                     logArr.Add(itemLog);
 
@@ -922,11 +918,12 @@ namespace UAS_MES_NEW.Make
                     if (equiType == "SPI")
                     {
                         sql.Clear();
-                        sql.Append($"SELECT ma_ishave_sn FROM make WHERE ma_code = '{item.Work_order}'");
+                        //sql.Append($"SELECT ma_ishave_sn FROM make WHERE ma_code = '{item.Work_order}'");
+                        sql.Append($"SELECT pr_tm_user FROM make a,product b WHERE a.ma_code = '{item.Work_order}' AND a.ma_prodcode = b.pr_code");
                         dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                         if (dt.Rows.Count > 0)
                         {
-                            ishave_sn = dt.Rows[0]["ma_ishave_sn"].ToString().Trim();
+                            ishave_sn = dt.Rows[0]["pr_tm_user"].ToString().Trim();
                         }
                     }
                     if (ishave_sn == "是")