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

UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs

@@ -185,6 +185,7 @@
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
             this.pi_class = new System.Windows.Forms.Label();
+            this.下载模板ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.Menu.SuspendLayout();
@@ -759,46 +760,47 @@
             this.toolStripMenuItem3,
             this.toolStripMenuItem4,
             this.toolStripMenuItem5,
-            this.toolStripMenuItem6});
+            this.toolStripMenuItem6,
+            this.下载模板ToolStripMenuItem});
             this.Menu.Name = "Menu";
             this.Menu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.Menu.Size = new System.Drawing.Size(149, 136);
+            this.Menu.Size = new System.Drawing.Size(153, 180);
             this.Menu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.Menu_ItemClicked);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem1.Text = "采集策略设置";
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem2.Text = "附加信息设置";
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem3.Text = "导出数据";
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem4.Text = "权限设置";
             // 
             // toolStripMenuItem5
             // 
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem5.Text = "标签维护";
             // 
             // toolStripMenuItem6
             // 
             this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem6.Text = "条码导入生成";
             // 
             // ImportExcel
@@ -1793,6 +1795,12 @@
             this.pi_class.TabIndex = 90;
             this.pi_class.Visible = false;
             // 
+            // 下载模板ToolStripMenuItem
+            // 
+            this.下载模板ToolStripMenuItem.Name = "下载模板ToolStripMenuItem";
+            this.下载模板ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.下载模板ToolStripMenuItem.Text = "下载模板";
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2025,5 +2033,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
         private System.Windows.Forms.Label pi_class;
+        private System.Windows.Forms.ToolStripMenuItem 下载模板ToolStripMenuItem;
     }
 }

UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -237,7 +237,7 @@ namespace UAS_LabelMachine
             Height = ScreenArea.Height;
             MidBoxCapacity.Value = Properties.Settings.Default.MidBoxCapacity;
             OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
-            SingleLabelPrinter.Text= Properties.Settings.Default.SinglePrinter;
+            SingleLabelPrinter.Text = Properties.Settings.Default.SinglePrinter;
             MidLabelPrinter.Text = Properties.Settings.Default.MidPrinter;
             OutBoxPrinter.Text = Properties.Settings.Default.OutPrinter;
 
@@ -2226,6 +2226,15 @@ namespace UAS_LabelMachine
                         stw.ShowDialog();
                     }
                     break;
+                case "下载模板":
+                    ExportFileDialog.Description = "选择导出的路径";
+                    result = ExportFileDialog.ShowDialog();
+                    if (result == DialogResult.OK)
+                    {
+                        File.Copy(System.Windows.Forms.Application.StartupPath+ "\\导入模板.xlsx", ExportFileDialog.SelectedPath+ "\\导入模板.xlsx",true);
+                        System.Diagnostics.Process.Start(ExportFileDialog.SelectedPath + "\\导入模板.xlsx");
+                    }
+                    break;
                 default:
                     break;
             }