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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -50,7 +50,6 @@
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.CheckTSN = new System.Windows.Forms.CheckBox();
-            this.NoteForChange = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // PrintLabel
@@ -315,24 +314,11 @@
             this.CheckTSN.UseVisualStyleBackColor = true;
             this.CheckTSN.CheckedChanged += new System.EventHandler(this.CheckTSN_CheckedChanged);
             // 
-            // NoteForChange
-            // 
-            this.NoteForChange.AutoSize = true;
-            this.NoteForChange.Checked = true;
-            this.NoteForChange.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.NoteForChange.Location = new System.Drawing.Point(120, 21);
-            this.NoteForChange.Name = "NoteForChange";
-            this.NoteForChange.Size = new System.Drawing.Size(119, 19);
-            this.NoteForChange.TabIndex = 187;
-            this.NoteForChange.Text = "切换工单提醒";
-            this.NoteForChange.UseVisualStyleBackColor = true;
-            // 
             // Make_ColorBoxLabelPrint
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1251, 600);
-            this.Controls.Add(this.NoteForChange);
             this.Controls.Add(this.CheckTSN);
             this.Controls.Add(this.LockMakeCode);
             this.Controls.Add(this.ma_code);
@@ -391,6 +377,5 @@
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private System.Windows.Forms.CheckBox CheckTSN;
-        private System.Windows.Forms.CheckBox NoteForChange;
     }
 }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -162,48 +162,9 @@ namespace UAS_MES.Make
                 {
                     //判断界面工单是否为空时的序列号是否自动归属工单
                     string oStatus = "";
-                    bool NoteAlready = false;
-                    LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oStatus, out ErrorMessage);
-                    if (NoteForChange.Checked)
-                    {
-                        if (ma_code.Text != oMakeCode && oMakeCode != "" && ma_code.Text != "" && oStatus != "2")
-                        {
-                            string ChangeMakeCode = MessageBox.Show(this.ParentForm, "序列号所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                            //如果选择不切换赋值当前界面工单
-                            if (ChangeMakeCode != "Yes")
-                            {
-                                oMakeCode = ma_code.Text;
-                            }
-                            else
-                            {
-                                NoteAlready = true;
-                            }
-                        }
-                        else
-                        {
-                            oMakeCode = ma_code.Text;
-                        }
-                    }
                     // 获取工单归属工单下一工序是否正确
-                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                     {
-                        if (NoteForChange.Checked && !NoteAlready)
-                        {
-                            if (oMakeCode != ma_code.Text && 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, sncode);
-                                    return;
-                                }
-                            }
-                        }
                         //获取工单的其他信息
                         sql.Clear();
                         sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,pr_detail,pr_spec from  ");