|
|
@@ -186,7 +186,7 @@ namespace UAS_MES.Make
|
|
|
string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
|
|
|
if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
|
|
|
{
|
|
|
- OperateResult.AppendText("当前序列号下一道工序" + nextstepcode, Color.Red);
|
|
|
+ OperateResult.AppendText("当前序列号下一道工序" + nextstepcode+",当前资源不允许采集\n", Color.Red);
|
|
|
return;
|
|
|
}
|
|
|
PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
|