|
|
@@ -157,12 +157,12 @@ namespace UAS_MES_NEW.Make
|
|
|
if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
|
|
|
{
|
|
|
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("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
- // return;
|
|
|
- //}
|
|
|
+ if (nextstepcode != User.CurrentStepCode)
|
|
|
+ {
|
|
|
+ string stname = dh.getFieldDataByCondition("step", "st_name", "st_code='" + nextstepcode + "'").ToString();
|
|
|
+ OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + stname + ",不是当前岗位的工序\n", Color.Red, sncode);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//IF (如果ma_code 为空)THEN
|
|
|
if (ma_code.Text == "" || ma_code.Text != oMakeCode)
|
|
|
{
|
|
|
@@ -376,7 +376,7 @@ namespace UAS_MES_NEW.Make
|
|
|
//记录日志
|
|
|
LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
|
|
|
//更新打印的数据
|
|
|
- //if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
|
|
|
+ if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
|
|
|
{
|
|
|
sncheck.Clear();
|
|
|
sncheck.Focus();
|
|
|
@@ -389,7 +389,7 @@ namespace UAS_MES_NEW.Make
|
|
|
}
|
|
|
//清空输入框的值，聚焦
|
|
|
sncode.Text = "";
|
|
|
- sncode.Focus();
|
|
|
+ //sncode.Focus();
|
|
|
//刷新打印数量和剩余数量
|
|
|
dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
|
|
|
BaseUtil.SetFormValue(Controls, dt);
|
|
|
@@ -405,13 +405,13 @@ namespace UAS_MES_NEW.Make
|
|
|
OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
}
|
|
|
}
|
|
|
- //else
|
|
|
- //{
|
|
|
- // OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
- // //清空输入框的值，聚焦
|
|
|
- // sncode.Text = "";
|
|
|
- // sncode.Focus();
|
|
|
- //}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
+ //清空输入框的值，聚焦
|
|
|
+ sncode.Text = "";
|
|
|
+ sncode.Focus();
|
|
|
+ }
|
|
|
}
|
|
|
//标签为空
|
|
|
else
|
callm