|
|
@@ -68,11 +68,12 @@ namespace UAS_MES.Make
|
|
|
//输入的是SN
|
|
|
if (!isImei1)
|
|
|
{
|
|
|
+ OperateResult.AppendText("<<"+sncode.Text+"\n", Color.Black);
|
|
|
//查询是否存在该ms_id
|
|
|
sql.Clear();
|
|
|
sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='"+sncode.Text+"' or exists (select 1 from makesnrelation where beforesn='"+sncode.Text+"' and ms_makecode=makecode)");
|
|
|
dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
|
|
|
- if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "0")
|
|
|
+ if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
|
|
|
{
|
|
|
//SN错误,不存在
|
|
|
//请输入SN
|
|
|
@@ -115,7 +116,7 @@ namespace UAS_MES.Make
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- OperateResult.AppendText("<<SN" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
|
|
|
+ OperateResult.AppendText("<<SN:" + sncode.Text + "对应的IMEI不存在\n", Color.Red);
|
|
|
sncode.Text = "";
|
|
|
OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
}
|
|
|
@@ -124,6 +125,7 @@ namespace UAS_MES.Make
|
|
|
//输入的是imei1
|
|
|
else
|
|
|
{
|
|
|
+ OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
|
|
|
if (imei1 == sncode.Text)
|
|
|
{
|
|
|
//说明输入的imei1对比一致
|
shim