|
|
@@ -280,13 +280,13 @@ namespace UAS_MES_NEW.Make
|
|
|
// OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
|
|
|
// return;
|
|
|
//}
|
|
|
- //string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
|
|
|
- //if (nextstepcode != User.CurrentStepCode)
|
|
|
- //{
|
|
|
- // string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
- // OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, code);
|
|
|
- // return;
|
|
|
- //}
|
|
|
+ string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();
|
|
|
+ if (nextstepcode != User.CurrentStepCode)
|
|
|
+ {
|
|
|
+ string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
+ OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, code);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//将录入框的值给序列号
|
|
|
sn_code.Text = code.Text;
|
|
|
sql.Clear();
|