Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -166,7 +166,7 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     //判断界面工单是否为空时的序列号是否自动归属工单
-                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
@@ -401,9 +401,17 @@ namespace UAS_MES.Make
                             LockMakeCode.Checked = true;
                         }
                     }
-                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                    else
+                    {
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                        return;
+                    }
+                }
+                else
+                {
+                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                    return;
                 }
-                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                 int RejectCount = ChoosedRejectList.Items.Count;
                 string[] bccode = new string[RejectCount];
                 string[] bcremark = new string[RejectCount];