Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -7,6 +7,8 @@ using UAS_MES.DataOperate;
 using UAS_MES.PublicMethod;
 using UAS_MES.Entity;
 using LabelManager2;
+using System.Threading;
+using UAS_MES.PublicForm;
 
 namespace UAS_MES.Make
 {
@@ -34,6 +36,7 @@ namespace UAS_MES.Make
         //当前提示的索引
         int RemainIndex = 0;
 
+        Thread InitPrint;
         ApplicationClass lbl;
 
         public Make_ColorBoxLabelPrint()
@@ -46,6 +49,14 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             sncode.Focus();
             asc.controllInitializeSize(this);
+            InitPrint = new Thread(InPrint);
+            SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
+            BaseUtil.SetFormCenter(stw);
+            stw.ShowDialog();
+        }
+
+        private void InPrint()
+        {
             lbl = new ApplicationClass();
         }
 
@@ -113,7 +124,7 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>请输入SN\n", Color.Green);
                                     return;
                                 }
-                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ma_code.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                                 
                                 if (LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "彩盒打印", User.UserSourceCode, User.UserCode, "彩盒打印成功", out ErrorMessage))
                                 {

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -305,16 +305,16 @@ namespace UAS_MES.SystemSetting
                 string FullPath = openFileDialog1.FileName;
                 FolderPath.Text = FullPath.Substring(0, FullPath.LastIndexOf("\\"));
                 la_name.Text = FullPath.Substring(FullPath.LastIndexOf("\\") + 1);
-                for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
-                {
-                    if (LabelDataGridView.Rows[i].Cells["Choose"].Value != null)
-                    {
-                        if ((bool)LabelDataGridView.Rows[i].Cells["Choose"].Value == true)
-                        {
-                            LabelDataGridView.Rows[i].Cells["pl_labelurl"].Value = FolderPath.Text;
-                        }
-                    }
-                }
+                //for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
+                //{
+                //    if (LabelDataGridView.Rows[i].Cells["Choose"].Value != null)
+                //    {
+                //        if ((bool)LabelDataGridView.Rows[i].Cells["Choose"].Value == true)
+                //        {
+                //            LabelDataGridView.Rows[i].Cells["pl_labelurl"].Value = FolderPath.Text;
+                //        }
+                //    }
+                //}
             }
         }