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

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -246,7 +246,7 @@ namespace UAS_MES.Make
                                     BaseUtil.SetFormValue(Controls, dt);
                                     sncode.Text = "";
                                     ms_id = null;
-                                    sncode.Focus();
+                                    sncode.Focus(); 
                                 }
                                 else
                                 {

UAS-MES/PublicMethod/Print.cs

@@ -104,7 +104,7 @@ namespace UAS_MES.PublicMethod
             }
             LogManager.DoLog(sb.ToString());
             //保存本次赋值进行打印
-            doc.Save();
+            //doc.Save();
             doc.Printer.SwitchTo(PrinterName);
             doc.PrintDocument(PrintNum);
             LogicHandler.DoCommandLog(iCaller, User.UserCode, "", User.UserLineCode, User.UserSourceCode, "打印", "成功打印", SnCode, "");