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

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -166,25 +166,25 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     string oStatus = "";
-                    LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out oStatus, out ErrorMessage);
-                    if (NoteForChange.Checked)
+                    if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
-                        if (ma_code.Text != oMakeCode && oMakeCode != "" && ma_code.Text != "" && oStatus != "2")
+                        if (NoteForChange.Checked)
                         {
-                            string ChangeMakeCode = MessageBox.Show(this.ParentForm, "序列号所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                            //如果选择不切换赋值当前界面工单
-                            if (ChangeMakeCode != "Yes")
+                            if (oMakeCode != ma_code.Text && ma_code.Text != "")
                             {
-                                oMakeCode = ma_code.Text;
+                                string ChangeMakeCode = MessageBox.Show(this.ParentForm, "序列号所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                                //如果选择不切换赋值当前界面工单
+                                if (ChangeMakeCode == "Yes")
+                                {
+                                    ma_code.Text = oMakeCode;
+                                }
+                                else
+                                {
+                                    OperateResult.AppendText(">>请重新采集序列号\n", Color.Red, ms_sncode);
+                                    return;
+                                }
                             }
                         }
-                        else
-                        {
-                            oMakeCode = ma_code.Text;
-                        }
-                    }
-                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
-                    {
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
                             dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");