|
|
@@ -288,12 +288,12 @@ namespace UAS_MES_NEW.Make
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " MMI2信息异常\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
- if (dh.CheckExist("product", "pr_code = '" + ma_prodcode.Text + "' and pr_volume = -1 ") && bt.Contains("UNKNOWN"))
|
|
|
+ if (dh.CheckExist("product", "pr_code = '" + ma_prodcode.Text + "' and pr_volume = -1 ") && !bt.Contains("UNKNOWN"))
|
|
|
{
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " BT信息异常\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
- if (dh.CheckExist("product", "pr_code = '" + ma_prodcode.Text + "' and pr_height = -1 ") && mac.Contains("UNKNOWN"))
|
|
|
+ if (dh.CheckExist("product", "pr_code = '" + ma_prodcode.Text + "' and pr_height = -1 ") && !mac.Contains("UNKNOWN"))
|
|
|
{
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " WIFI信息异常\n", Color.Red);
|
|
|
return;
|
|
|
@@ -304,7 +304,7 @@ namespace UAS_MES_NEW.Make
|
|
|
return;
|
|
|
}
|
|
|
listmac = dh.getFieldDataByCondition("makesnlist", "msl_mac", "msl_sncode ='" + ms_sncode.Text + "' and msl_makecode = '" + ma_code.Text + "'").ToString();
|
|
|
- if (listmac != "" && listmac != mac.ToUpper())
|
|
|
+ if (listmac != "" && listmac != mac.ToUpper()&& mac!="UNKNOWN")
|
|
|
{
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " 导入WIFI为:" + listmac + ",与二维码mac:" + mac + "不一致\n", Color.Red);
|
|
|
return;
|
|
|
@@ -318,7 +318,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
|
|
|
listbt = dh.getFieldDataByCondition("makesnlist", "msl_bt", "msl_sncode ='" + ms_sncode.Text + "' and msl_makecode = '" + ma_code.Text + "'").ToString();
|
|
|
- if (listbt != "" && listbt != bt.ToUpper())
|
|
|
+ if (listbt != "" && listbt != bt.ToUpper() && bt != "UNKNOWN")
|
|
|
{
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " 导入BT为:" + listbt + ",与二维码BT:" + bt + "不一致\n", Color.Red);
|
|
|
return;
|
callm