优化spi线体和归属工单问题

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -861,6 +861,7 @@ namespace UAS_MES_NEW.Make
                         res = currItem[1];
                         wo = ma_code.Text;
                         source = User.UserSourceCode;
+                        lineName = User.UserLineCode;
                     }
                     else if (equiType == "AOI")
                     {
@@ -917,47 +918,65 @@ namespace UAS_MES_NEW.Make
                 List<string> param = new List<string>() { };
                 foreach (var item in logs)
                 {
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, item.SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                    string ishave_sn = "";
+                    if (equiType == "SPI")
                     {
-                        if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, item.SN, "日志解析", "OK", User.UserCode, out oErrorMessage))
+                        sql.Clear();
+                        sql.Append($"SELECT ma_ishave_sn FROM make WHERE ma_code = '{item.Work_order}'");
+                        dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+                        if (dt.Rows.Count > 0)
                         {
-                            string sqlStr = $@"select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,ma_qty - nvl(mcd_okqty, 0) remain_qty 
+                            ishave_sn = dt.Rows[0]["ma_ishave_sn"].ToString().Trim();
+                        }
+                    }
+                    if (ishave_sn == "是")
+                    {
+                        if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, item.SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                        {
+                            if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, item.SN, "日志解析", "OK", User.UserCode, out oErrorMessage))
+                            {
+                                string sqlStr = $@"select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,ma_qty - nvl(mcd_okqty, 0) remain_qty 
                                         from make left join makecraftdetail on mcd_maid=ma_id left join product on pr_code = ma_prodcode 
                                         where ma_code='" + omakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'";
-                            dt = (DataTable)dh.ExecuteSql(sqlStr, "select");
-                            BaseUtil.SetFormValue(Controls, dt);
-                            //记录操作日志
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", item.SN, "");
-
-                            param.Add(item.SN);
-                            param.Add(omakeCode);
-                            param.Add(item.Result == "PASS" ? "OK" : "NG");
-                            param.Add(equiType);
-                            param.Add(item.Details);
-                            param.Add(User.UserCode);
-                            param.Add(item.Source);
-                            param.Add(item.Line);
-                            string res = "";
-                            param.Add(res);
-                            string[] paramList = param.ToArray();
-                            dh.CallProcedure("cs_insert_testrejects", ref paramList);
-                            param.Clear();
-                            LogMessage($"文件: {PathName},共{fileNum}条记录已过站解析");
-
-                            if (logs.IndexOf(item) == logs.Count - 1)
+                                dt = (DataTable)dh.ExecuteSql(sqlStr, "select");
+                                BaseUtil.SetFormValue(Controls, dt);
+                                //记录操作日志
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", item.SN, "");
+
+                                param.Add(item.SN);
+                                param.Add(omakeCode);
+                                param.Add(item.Result == "PASS" ? "OK" : "NG");
+                                param.Add(equiType);
+                                param.Add(item.Details);
+                                param.Add(User.UserCode);
+                                param.Add(item.Source);
+                                param.Add(item.Line);
+                                string res = "";
+                                param.Add(res);
+                                string[] paramList = param.ToArray();
+                                dh.CallProcedure("cs_insert_testrejects", ref paramList);
+                                param.Clear();
+                                LogMessage($"文件: {PathName},共{fileNum}条记录已过站解析");
+
+                                if (logs.IndexOf(item) == logs.Count - 1)
+                                {
+                                    return true;
+                                }
+                            }
+                            else
                             {
-                                return true;
+                                LogMessage($"处理过站NG:{oErrorMessage}");
+                                break;
                             }
                         }
                         else
                         {
-                            LogMessage($"处理过站NG:{oErrorMessage}");
+                            LogMessage($"过站核对NG:{oErrorMessage}");
                             break;
                         }
                     }
                     else
                     {
-                        LogMessage($"过站核对NG:{oErrorMessage}");
                         param.Add(item.SN);
                         param.Add(item.Work_order);
                         param.Add(item.Result == "PASS" ? "OK" : "NG");
@@ -978,6 +997,7 @@ namespace UAS_MES_NEW.Make
                             return true;
                         }
                     }
+                    
                 }
                 return false;
             }