|
|
@@ -361,7 +361,7 @@ namespace UAS_MES.Make
|
|
|
case "IMEI1":
|
|
|
case "IMEI2":
|
|
|
case "IMEI3":
|
|
|
- if (!ChangeResult.Checked&&checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
|
|
|
+ if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and (ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "')"))
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
|
|
|
OperateResult.AppendText(">>请输入" + type + "\n", Color.Black,code);
|
|
|
@@ -384,7 +384,7 @@ namespace UAS_MES.Make
|
|
|
case "BT":
|
|
|
case "MAC":
|
|
|
case "NETCODE":
|
|
|
- if (!ChangeResult.Checked&&checkExist("MS_" + type + "='" + code.Text + "'"))
|
|
|
+ if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and MS_" + type + "='" + code.Text + "'"))
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + code.Text + "错误，不允许重复\n", Color.Red);
|
|
|
OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black,code);
|
|
|
@@ -409,7 +409,7 @@ namespace UAS_MES.Make
|
|
|
//遍历判断已采集的信息是否已存在
|
|
|
foreach (DictionaryEntry de in hs)
|
|
|
{
|
|
|
- if (dh.CheckExist("makeserial", "MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'"))
|
|
|
+ if (dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')<>' ' and MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "'"))
|
|
|
{
|
|
|
flag = false;
|
|
|
OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
|
shim