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

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -913,11 +913,20 @@ namespace UAS_MES_NEW.Make
                     }
                     else if (equiType == "AOI")
                     {
-                        if (currItem.Length > 2)
+                        res = currItem[3];
+                        detail = currItem[3];
+
+                        sql.Clear();
+                        sql.Append($"SELECT a.ms_linecode, a.ms_makecode FROM makeserial a WHERE a.ms_sncode = '{currItem[0]}'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        if (dt.Rows.Count > 0 && !String.IsNullOrEmpty(dt.Rows[0]["ms_linecode"].ToString()))
                         {
-                            res = currItem[3];
-                            detail = currItem[3];
+                            wo = dt.Rows[0]["ms_makecode"].ToString();
+                            line = dt.Rows[0]["ms_linecode"].ToString();
+                        }
 
+                        if(string.IsNullOrEmpty(wo) && string.IsNullOrEmpty(line))
+                        {
                             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");
@@ -926,19 +935,6 @@ namespace UAS_MES_NEW.Make
                                 wo = dt.Rows[0]["dl_macode"].ToString();
                                 line = dt.Rows[0]["li_code"].ToString();
                             }
-                        }else if (currItem.Length == 2)
-                        {
-                            res = currItem[1];
-                            detail = currItem[1];
-
-                            sql.Clear();
-                            sql.Append($"SELECT a.ms_linecode, a.ms_makecode FROM makeserial a WHERE a.ms_sncode = '{currItem[0]}'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            if (dt.Rows.Count > 0 && !String.IsNullOrEmpty(dt.Rows[0]["ms_linecode"].ToString()))
-                            {
-                                wo = dt.Rows[0]["ms_makecode"].ToString();
-                                line = dt.Rows[0]["ms_linecode"].ToString();
-                            }
                         }
                     }
                     Log itemLog = new Log()
@@ -977,17 +973,14 @@ namespace UAS_MES_NEW.Make
                 foreach (var item in logs)
                 {
                     string ishave_sn = "";
-                    if (equiType == "SPI")
+                    sql.Clear();
+                    sql.Append($"SELECT b.pr_tm_user FROM make a, product b, makeserial c WHERE a.ma_code = c.ms_makecode AND a.ma_prodcode = b.pr_code AND c.ms_sncode = '{item.SN}'");
+                    dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+                    if (dt.Rows.Count > 0)
                     {
-                        sql.Clear();
-                        //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]["pr_tm_user"].ToString().Trim();
-                        }
+                        ishave_sn = dt.Rows[0]["pr_tm_user"].ToString().Trim();
                     }
+
                     if (ishave_sn == "是")
                     {
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, item.SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))