|
|
@@ -115,6 +115,12 @@ namespace UAS_MES.Make
|
|
|
string oMsID = "";
|
|
|
if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
|
|
|
{
|
|
|
+ string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
|
|
|
+ if (nextstepcode != User.CurrentStepCode)
|
|
|
+ {
|
|
|
+ OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//如果未打开串口设置为0
|
|
|
//if (pr_colorboxunit.Text == "kg" && !WeightChange)
|
|
|
//{
|