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

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -118,6 +118,7 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<输入不能为空\n", Color.Red);
                     return;
                 }
+                OperateResult.AppendText(">>" + inputText.Text + "\n", Color.Black);
                 //打印类型为彩盒或者机身标
                 if (giftBox.Checked || fuselagel.Checked)
                 {

UAS_AutoPass/AutoAnalysisXml.cs

@@ -289,7 +289,7 @@ namespace UAS_AutoPass
                 LogicHandler.GetMakeInfo(sncode, out makecode, out status, out errmessage);
                 if (ma_code.Text != makecode && makecode != "" && ma_code.Text != "" && status != "2")
                 {
-                    string ChangeMakeCode = MessageBox.Show(this.ParentForm, "序列号所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = MessageBox.Show(this.ParentForm, "序列号" + sncode + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     //如果选择不切换赋值当前界面工单
                     if (ChangeMakeCode != "Yes")
                     {