|
|
@@ -193,7 +193,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
OperateResult.AppendText(">>" + code.Text + "\n", Color.Black);
|
|
|
//开始录入SN
|
|
|
- if (ChangeResult.Checked||!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
|
|
|
+ if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='"+oMsid+"'"))||!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
|
|
|
{
|
|
|
//判断用户是否锁定输入SN长度,
|
|
|
if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度", "SN"))
|
|
|
@@ -381,7 +381,7 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//校验已经完成,此时要再次校验之前的SN和关联采集信息
|
|
|
//再次校验SN
|
|
|
- if (!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'"))
|
|
|
+ if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "'"))||!dh.CheckExist("makeserial", "ms_sncode='" + SN + "'"))
|
|
|
{
|
|
|
bool flag = true;
|
|
|
if (!ChangeResult.Checked)
|