|
|
@@ -854,23 +854,26 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(item)) continue;
|
|
|
string[] currItem = item.Split(',');
|
|
|
- string res = "",wo = "",lineName = "";
|
|
|
+ string res = "",wo = "",lineName = "",source = "";
|
|
|
if(equiType == "SPI")
|
|
|
{
|
|
|
res = currItem[1];
|
|
|
wo = ma_code.Text;
|
|
|
+ source = User.UserSourceCode;
|
|
|
}
|
|
|
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 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");
|
|
|
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
|
|
|
{
|
|
|
@@ -883,6 +886,7 @@ namespace UAS_MES_NEW.Make
|
|
|
SN = currItem[0],
|
|
|
Work_order = wo,
|
|
|
Line = lineName,
|
|
|
+ Source = source,
|
|
|
Result = res,
|
|
|
Details = equiType == "SPI" ? currItem[1] : currItem[3]
|
|
|
};
|
|
|
@@ -930,14 +934,14 @@ namespace UAS_MES_NEW.Make
|
|
|
param.Add(equiType);
|
|
|
param.Add(item.Details);
|
|
|
param.Add(User.UserCode);
|
|
|
- param.Add(User.UserSourceCode);
|
|
|
+ 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}条记录,已过站解析");
|
|
|
+ LogMessage($"文件: {PathName},共{fileNum}条记录已过站解析");
|
|
|
|
|
|
if (logs.IndexOf(item) == logs.Count - 1)
|
|
|
{
|
|
|
@@ -946,26 +950,27 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- LogMessage($"处理过站error:{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");
|
|
|
param.Add(equiType);
|
|
|
param.Add(item.Details);
|
|
|
param.Add(User.UserCode);
|
|
|
- param.Add(User.UserSourceCode);
|
|
|
+ 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}条记录,已解析");
|
|
|
+ LogMessage($"文件: {PathName},共{fileNum}条记录已解析");
|
|
|
|
|
|
if (logs.IndexOf(item) == logs.Count - 1)
|
|
|
{
|
|
|
@@ -1298,6 +1303,7 @@ namespace UAS_MES_NEW.Make
|
|
|
{
|
|
|
public string Work_order { get; set; }
|
|
|
public string Line { get; set; }
|
|
|
+ public string Source { get; set; }
|
|
|
public string SN { set; get; }
|
|
|
public string Result { set; get; }
|
|
|
/*public List<NgData> Details { set; get; }*/
|
