|
|
@@ -833,7 +833,6 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
string oStatus = "";
|
|
|
GetMakeInfo(iSN, out oMakeCode, out oStatus, out oErrorMessage);
|
|
|
oErrorMessage = "";
|
|
|
- bool NoteAlready = false;
|
|
|
if (iChangeMakeCodeNote)
|
|
|
{
|
|
|
if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
|
|
|
@@ -843,11 +842,9 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
if (ChangeMakeCode != "Yes")
|
|
|
{
|
|
|
oErrorMessage = "请重新采集序列号";
|
|
|
- NoteAlready = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- NoteAlready = true;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1549,7 +1546,6 @@ namespace UAS_MES_NEW.PublicMethod
|
|
|
prodcode = dh.getFieldDataByCondition("package", "pa_prodcode", "pa_outboxcode='" + outboxcode + "'").ToString();
|
|
|
error = ">>当前箱" + outboxcode + "对应物料" + prodcode + "没有维护装箱规则";
|
|
|
return false;
|
|
|
- break;
|
|
|
}
|
|
|
error = "";
|
|
|
return true;
|