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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -193,10 +193,10 @@ namespace UAS_MES.Make
                             OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
                             if (pr_change)
                             {
-                                String dialog = MessageBox.Show("产品更改，确认标签模板选择正确", "提示", MessageBoxButtons.OKCancel).ToString();
+                                String dialog = MessageBox.Show("是否使用当前标签模板", "提示", MessageBoxButtons.OKCancel).ToString();
                                 if (dialog != "OK")
                                 {
-                                    OperateResult.AppendText(">>产品编号改变，请重新选择标签模板\n", Color.Green);
+                                    OperateResult.AppendText(">>请重新选择标签模板\n", Color.Green);
                                     return;
                                 }
                                 else