|
|
@@ -96,7 +96,7 @@ namespace UAS_AutoPass
|
|
|
{
|
|
|
if (Master.Text == DB.Rows[i]["ma_user"].ToString())
|
|
|
{
|
|
|
- DataHelper.DBConnectionString = "Data Source=" + DB.Rows[i]["ma_address"] + ";User ID=" + DB.Rows[i]["ma_user"] + ";PassWord=" + DB.Rows[i]["ms_pwd"]; ;
|
|
|
+ DataHelper.DBConnectionString = "Data Source=192.168.230.200/orcl;User ID=" + DB.Rows[i]["ma_user"] + ";PassWord=" + DB.Rows[i]["ms_pwd"]; ;
|
|
|
dh = new DataHelper();
|
|
|
}
|
|
|
}
|
|
|
@@ -249,6 +249,11 @@ namespace UAS_AutoPass
|
|
|
makecode = dt.Rows[0]["ms_makecode"].ToString();
|
|
|
sncode = dt.Rows[0]["ms_sncode"].ToString();
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("当前线别在" + istepcode + "无可分配序列号");
|
|
|
+ return;
|
|
|
+ }
|
|
|
//-2-NG2017/10/2514:46:29.xml取第二位版号
|
|
|
string combinecode = e.Name.Substring(1, 1);
|
|
|
if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? makecode : ma_code.Text, isource, sncode, iusercode, out oMakeCode, out oMSID, out oErrMessage))
|
