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

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -119,7 +119,6 @@ namespace UAS_MES.Make
                 }
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "已采集满\n", Color.Red);
-
         }
 
         private void Print_Click(object sender, EventArgs e)
@@ -130,21 +129,17 @@ namespace UAS_MES.Make
                 DialogResult result = MessageBox.Show("该箱未采集满,确定打印？", "提示", MessageBoxButtons.YesNo);
                 if (result.ToString() == "Yes")
                 {
-                    try
-                    {
-                        OperateResult.AppendText(">>开始打印\n", Color.Green);
-                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
-                    }
-                    catch
-                    {
-                        OperateResult.AppendText(">>打印程序异常，请检查是否连接打印机或者打印软件是否安装\n", Color.Red);
-                    }
+                    OperateResult.AppendText(">>开始打印\n", Color.Green);
+                    Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
                 }
             }
             else
             {
                 if (PrintLabel.SelectedValue != null)
+                {
+                    OperateResult.AppendText(">>开始打印\n", Color.Green);
                     Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                }
             }
         }
 

UAS-MES/Main.cs

@@ -112,11 +112,6 @@ namespace UAS_MES
             SystemInf.HeadBarHeight = headBar1.Height;
         }
 
-        private void RefreshDB(object sender, EventArgs e)
-        {
-            DataHelper dh = new DataHelper();
-        }
-
         /// <summary>
         ///设置窗体的最大化和最小化状态
         /// </summary>

UAS_XmlAnalysor/Form1.Designer.cs

@@ -212,6 +212,7 @@
             this.AutoStart.TabIndex = 16;
             this.AutoStart.Text = "开机自动启动";
             this.AutoStart.UseVisualStyleBackColor = true;
+            this.AutoStart.CheckedChanged += new System.EventHandler(this.AutoStart_CheckedChanged);
             // 
             // Form1
             // 

UAS_XmlAnalysor/Form1.cs

@@ -118,7 +118,6 @@ namespace UAS_XmlAnalysor
             ChooseFolder.Enabled = false;
             ChooseBackUpFolder.Enabled = false;
             StopWatch.Enabled = true;
-            SetAutoRun();
             OperateResult.AppendText("开始执行监控\n");
         }
 
@@ -285,5 +284,10 @@ namespace UAS_XmlAnalysor
                 e.Cancel = true;
             }
         }
+
+        private void AutoStart_CheckedChanged(object sender, EventArgs e)
+        {
+            SetAutoRun();
+        }
     }
 }