|
@@ -1358,12 +1358,12 @@ namespace UAS_MES.PublicMethod
|
|
|
{
|
|
{
|
|
|
if (dt.Rows[0]["ms_downstatus"].ToString() != "0")
|
|
if (dt.Rows[0]["ms_downstatus"].ToString() != "0")
|
|
|
{
|
|
{
|
|
|
- ErrMessage = "序列号:" + iSonCode + "已下地,请先取消下地";
|
|
|
|
|
|
|
+ ErrMessage = "序列号:" + iSN + "已下地,请先取消下地";
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
if (dt.Rows[0]["ms_nextmacode"].ToString() != "")
|
|
if (dt.Rows[0]["ms_nextmacode"].ToString() != "")
|
|
|
{
|
|
{
|
|
|
- ErrMessage = "序列号:" + iSonCode + "已被工单" + dt.Rows[0]["ms_nextmacode"].ToString() + "使用";
|
|
|
|
|
|
|
+ ErrMessage = "序列号:" + iSN + "已被工单" + dt.Rows[0]["ms_nextmacode"].ToString() + "使用";
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
if (dt.Rows[0]["ms_salecode"].ToString() != dh.getFieldDataByCondition("make", "ma_salecode", "ma_code='" + iMakeCode + "'").ToString())
|
|
if (dt.Rows[0]["ms_salecode"].ToString() != dh.getFieldDataByCondition("make", "ma_salecode", "ma_code='" + iMakeCode + "'").ToString())
|
|
@@ -1378,7 +1378,10 @@ namespace UAS_MES.PublicMethod
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
|
|
+ {
|
|
|
|
|
+ dh.UpdateByCondition("makeserial", "ms_nextmacode='"+iMakeCode+"'", "ms_id=(select max(ms_id) from makeserial where ms_sncode='"+iSN+"')");
|
|
|
return true;
|
|
return true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else ErrMessage = "序列号" + iSN + "不存在";
|
|
else ErrMessage = "序列号" + iSN + "不存在";
|
|
|
break;
|
|
break;
|