|
|
@@ -149,7 +149,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
case "MAC/WIFI":
|
|
|
case "BT":
|
|
|
- if (dh.CheckExist("makeserial", "ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text + "' and ms_id='" + ms_id + "'"))
|
|
|
+ if (dh.CheckExist("makeserial", "ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text.Replace(":", "").Replace("-", "") + "' and ms_id='" + ms_id + "'"))
|
|
|
{
|
|
|
//如果一样提示用户“MAC 不允许与原来的值一致”,“请采集MAC”;
|
|
|
OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + "不允许与原来的值一致\n", Color.Red);
|
|
|
@@ -175,18 +175,18 @@ namespace UAS_MES.Make
|
|
|
return;
|
|
|
}
|
|
|
//验证长度前缀通过,验证数据库
|
|
|
- if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text + "'"))
|
|
|
+ if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " ='" + inputValue.Text.Replace(":", "").Replace("-", "") + "'"))
|
|
|
{
|
|
|
OperateResult.AppendText("<<" + ((CheckBox)list[step - 1]).Text + ":" + inputValue.Text + "错误,已被使用\n", Color.Red, inputValue);
|
|
|
return;
|
|
|
}
|
|
|
//通过校验
|
|
|
- sb.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text + "',");
|
|
|
- toSi.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text + "',");
|
|
|
+ sb.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text.Replace(":", "").Replace("-", "") + "',");
|
|
|
+ toSi.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + " = '" + inputValue.Text.Replace(":", "").Replace("-", "") + "',");
|
|
|
insertSninfoFields.Append("si_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ",");
|
|
|
- insertSninfoValues.Append("'"+inputValue.Text+"',");
|
|
|
+ insertSninfoValues.Append("'"+inputValue.Text.Replace(":", "").Replace("-", "") + "',");
|
|
|
oldData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + dt.Rows[0]["ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0]].ToString() + ",");
|
|
|
- newData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + inputValue.Text + ",");
|
|
|
+ newData.Append("ms_" + ((CheckBox)list[step - 1]).Text.Split('/')[0] + ":" + inputValue.Text.Replace(":", "").Replace("-", "") + ",");
|
|
|
}
|
|
|
break;
|
|
|
case "网标":
|