|
@@ -282,6 +282,7 @@ namespace UAS_AutoPass
|
|
|
tipform.startthread(oErrMessage, "NG");
|
|
tipform.startthread(oErrMessage, "NG");
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+ tipform.startthread("序列号 " + sncode + "通过检测", test_result);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -555,7 +556,7 @@ namespace UAS_AutoPass
|
|
|
//获取资源,线别,工序相等，并且状态在线的序列号进行分配
|
|
//获取资源,线别,工序相等，并且状态在线的序列号进行分配
|
|
|
sql.Clear();
|
|
sql.Clear();
|
|
|
sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
|
|
sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
|
|
|
- sql.Append("ms_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
|
|
|
|
|
|
|
+ sql.Append(" sc_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
{
|
