|
|
@@ -670,6 +670,13 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_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)
|
|
|
+ {
|
|
|
+ string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
+ OperateResult.AppendText("<<序列号:" + ms_sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, ms_sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//是否提示过工单切换框，检测前后执行
|
|
|
if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
|
|
|
{
|
|
|
@@ -737,7 +744,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
if (dh.CheckExist("product", "pr_code = '" + ma_prodcode.Text + "' and pr_height = -1 "))
|
|
|
{
|
|
|
- bool shouldNotIntercept = !string.IsNullOrEmpty(bt) || mac.Contains("UNKNOWN");
|
|
|
+ bool shouldNotIntercept = !string.IsNullOrEmpty(mac) || mac.Contains("UNKNOWN");
|
|
|
if (!shouldNotIntercept) // 若不满足不拦截条件，则拦截
|
|
|
{
|
|
|
OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " WIFI信息异常\n", Color.Red);
|
callm