|
|
@@ -167,16 +167,8 @@ namespace UAS_MES.Make
|
|
|
{
|
|
|
//判断界面工单是否为空时的序列号是否自动归属工单
|
|
|
string oStatus = "";
|
|
|
- if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oStatus, out ErrorMessage2))
|
|
|
- {
|
|
|
- if (ma_code.Text == "")
|
|
|
- {
|
|
|
- OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red, sncode);
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
// 获取工单归属工单下一工序是否正确
|
|
|
- if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
|
|
|
+ if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
|
|
|
{
|
|
|
//获取工单的其他信息
|
|
|
sql.Clear();
|