|
|
@@ -106,14 +106,13 @@ namespace UAS_MES_NEW.Make
|
|
|
OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
|
|
|
if (imei1 == sncode.Text)
|
|
|
{
|
|
|
- OperateResult.AppendText("<<SN核对成功\n", Color.Green, sncode);
|
|
|
- OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
- SetCheck set = new SetCheck("OK", Color.Green);
|
|
|
- BaseUtil.SetFormCenter(set);
|
|
|
- set.ShowDialog();
|
|
|
+ //OperateResult.AppendText("<<SN核对成功\n", Color.Green, sncode);
|
|
|
+ //OperateResult.AppendText(">>请输入SN\n", Color.Black);
|
|
|
+ //SetCheck set = new SetCheck("OK", Color.Green);
|
|
|
+ //BaseUtil.SetFormCenter(set);
|
|
|
+ //set.ShowDialog();
|
|
|
|
|
|
- #region
|
|
|
- /*if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
|
|
|
+ if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
|
|
|
{
|
|
|
//判断序列号下一工序(CHECKSTEPSNANDMACODE)
|
|
|
if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
|
|
|
@@ -167,8 +166,7 @@ namespace UAS_MES_NEW.Make
|
|
|
//判定工序属性不通过
|
|
|
OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
|
|
|
recordResult(SN, DateTime.Now.ToString(), "失败");
|
|
|
- }*/
|
|
|
- #endregion
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|