|
|
@@ -387,7 +387,8 @@ namespace UAS_MES.Make
|
|
|
case "IMEI1":
|
|
|
case "IMEI2":
|
|
|
case "IMEI3":
|
|
|
- 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 + "')"))
|
|
|
+ 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 + "')")
|
|
|
+ || 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 + "') and ms_id <> '"+oMsid+"'"))
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
|
|
|
OperateResult.AppendText(">>请输入" + type + "\n", Color.Black,code);
|
|
|
@@ -413,7 +414,8 @@ namespace UAS_MES.Make
|
|
|
case "BT":
|
|
|
case "MAC":
|
|
|
case "NETCODE":
|
|
|
- if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and MS_" + type + "='" + code.Text + "'"))
|
|
|
+ if (!ChangeResult.Checked&&checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and MS_" + type + "='" + code.Text + "'")
|
|
|
+ || ChangeResult.Checked && checkExist("ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and MS_" + type + "='" + code.Text + "' and ms_id <> '"+oMsid+"'"))
|
|
|
{
|
|
|
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);
|
|
|
@@ -433,22 +435,20 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//校验已经完成,此时要再次校验之前的SN和关联采集信息
|
|
|
//再次校验SN
|
|
|
- if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + SN + "' and ms_id='" + oMsid + "'"))||!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'"))
|
|
|
+ if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + SN + "' and ms_id='" + oMsid + "'"))||!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'")||(!ChangeResult.Checked&&(TSN==SN)))
|
|
|
{
|
|
|
bool flag = true;
|
|
|
- if (!ChangeResult.Checked)
|
|
|
+ //遍历判断已采集的信息是否已存在
|
|
|
+ foreach (DictionaryEntry de in hs)
|
|
|
{
|
|
|
- //遍历判断已采集的信息是否已存在
|
|
|
- foreach (DictionaryEntry de in hs)
|
|
|
+ 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 + "'")
|
|
|
+ ||(ChangeResult.Checked&& dh.CheckExist("makeserial", "ms_status in (1,2,3) and nvl(ms_nextmacode,' ')=' ' and MS_" + (de.Key.ToString() == "WIFI" ? "MAC" : de.Key) + "='" + de.Value + "' and ms_id <> '"+oMsid+"'")))
|
|
|
{
|
|
|
- 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);
|
|
|
- //清空信息
|
|
|
- clearInfo();
|
|
|
- break;
|
|
|
- }
|
|
|
+ flag = false;
|
|
|
+ OperateResult.AppendText(">>" + de.Key + "已被使用,请重新输入TSN,重新转换\n", Color.Red);
|
|
|
+ //清空信息
|
|
|
+ clearInfo();
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|
