修改工单提示

UAS_MES_ZJT/PublicMethod/LogicHandler.cs

@@ -611,17 +611,9 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                    //如果选择不切换赋值当前界面工单
-                    if (ChangeMakeCode != "Yes")
-                    {
-                        oErrorMessage = "请重新采集序列号";
-                        NoteAlready = true;
-                    }
-                    else
-                    {
-                        NoteAlready = true;
-                    }
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同", "提示").ToString();
+                    oErrorMessage = "请重新采集序列号";
+                    NoteAlready = true;
                 }
                 else
                 {
@@ -652,16 +644,9 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (iSNMakecode != ctl.Text && ctl.Text != "")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同", "提示").ToString();
                     //如果选择不切换赋值当前界面工单
-                    if (ChangeMakeCode == "Yes")
-                    {
-                        ctl.Text = iSNMakecode;
-                    }
-                    else
-                    {
-                        oErrMessage = "请重新采集序列号";
-                    }
+                    oErrMessage = "请重新采集序列号";
                 }
             }
             return (oErrMessage == "" || oErrMessage == null);