Browse Source

优化调整界面

章政 6 years ago
parent
commit
9e60e80962

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

@@ -40,10 +40,8 @@
             this.CollectionUnit = new System.Windows.Forms.ComboBox();
             this.CollectionUnit_label = new System.Windows.Forms.Label();
             this.GenerateBarCode = new System.Windows.Forms.Button();
-            this.LabelMainTain = new System.Windows.Forms.Button();
             this.SaveGrid = new System.Windows.Forms.Button();
             this.sg_separator_label = new System.Windows.Forms.Label();
-            this.CollectionSetting = new System.Windows.Forms.Button();
             this.Si_ItemDGV = new System.Windows.Forms.DataGridView();
             this.si_detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.si_index = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -90,16 +88,13 @@
             this.MidSource = new System.Windows.Forms.BindingSource(this.components);
             this.ChooseAll = new System.Windows.Forms.Button();
             this.ExportFileDialog = new System.Windows.Forms.FolderBrowserDialog();
-            this.AttachInfo = new System.Windows.Forms.Button();
             this.pi_date = new System.Windows.Forms.Label();
             this.CleanBarCode = new System.Windows.Forms.Button();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.ExportData = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
             this.MidBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.MidBoxBegin = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.label16 = new System.Windows.Forms.Label();
-            this.PowerSetting = new System.Windows.Forms.Button();
             this.SingleBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleBoxBegin = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.label12 = new System.Windows.Forms.Label();
@@ -123,6 +118,29 @@
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.label8 = new System.Windows.Forms.Label();
@@ -157,29 +175,13 @@
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
             this.cu_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MenuSetting = new System.Windows.Forms.Button();
+            this.Menu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -190,6 +192,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.MidBoxCapacity)).BeginInit();
             this.OutBoxLabel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.OutboxCapacity)).BeginInit();
+            this.Menu.SuspendLayout();
             this.SuspendLayout();
             // 
             // pi_inoutno_label
@@ -301,18 +304,6 @@
             this.GenerateBarCode.UseVisualStyleBackColor = true;
             this.GenerateBarCode.Click += new System.EventHandler(this.GenerateBarCode_Click);
             // 
-            // LabelMainTain
-            // 
-            this.LabelMainTain.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelMainTain.Location = new System.Drawing.Point(448, 178);
-            this.LabelMainTain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.LabelMainTain.Name = "LabelMainTain";
-            this.LabelMainTain.Size = new System.Drawing.Size(68, 26);
-            this.LabelMainTain.TabIndex = 57;
-            this.LabelMainTain.Text = "标签维护";
-            this.LabelMainTain.UseVisualStyleBackColor = true;
-            this.LabelMainTain.Click += new System.EventHandler(this.LabelMaintain_Click);
-            // 
             // SaveGrid
             // 
             this.SaveGrid.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -335,18 +326,6 @@
             this.sg_separator_label.TabIndex = 61;
             this.sg_separator_label.Text = "分隔符";
             // 
-            // CollectionSetting
-            // 
-            this.CollectionSetting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CollectionSetting.Location = new System.Drawing.Point(230, 104);
-            this.CollectionSetting.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.CollectionSetting.Name = "CollectionSetting";
-            this.CollectionSetting.Size = new System.Drawing.Size(88, 26);
-            this.CollectionSetting.TabIndex = 63;
-            this.CollectionSetting.Text = "采集策略设置";
-            this.CollectionSetting.UseVisualStyleBackColor = true;
-            this.CollectionSetting.Click += new System.EventHandler(this.CollectionSetting_Click);
-            // 
             // Si_ItemDGV
             // 
             this.Si_ItemDGV.AllowUserToAddRows = false;
@@ -736,19 +715,6 @@
             this.ChooseAll.UseVisualStyleBackColor = true;
             this.ChooseAll.Click += new System.EventHandler(this.ChooseAll_Click);
             // 
-            // AttachInfo
-            // 
-            this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AttachInfo.Location = new System.Drawing.Point(230, 141);
-            this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.AttachInfo.Name = "AttachInfo";
-            this.AttachInfo.Size = new System.Drawing.Size(88, 26);
-            this.AttachInfo.TabIndex = 85;
-            this.AttachInfo.Text = "附加信息设置";
-            this.AttachInfo.UseVisualStyleBackColor = true;
-            this.AttachInfo.Visible = false;
-            this.AttachInfo.Click += new System.EventHandler(this.AttachInfo_Click);
-            // 
             // pi_date
             // 
             this.pi_date.AutoSize = true;
@@ -762,7 +728,7 @@
             // CleanBarCode
             // 
             this.CleanBarCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanBarCode.Location = new System.Drawing.Point(522, 178);
+            this.CleanBarCode.Location = new System.Drawing.Point(449, 178);
             this.CleanBarCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanBarCode.Name = "CleanBarCode";
             this.CleanBarCode.Size = new System.Drawing.Size(68, 26);
@@ -773,12 +739,10 @@
             // 
             // groupBoxWithBorder1
             // 
-            this.groupBoxWithBorder1.Controls.Add(this.ExportData);
             this.groupBoxWithBorder1.Controls.Add(this.label18);
             this.groupBoxWithBorder1.Controls.Add(this.MidBoxEnd);
             this.groupBoxWithBorder1.Controls.Add(this.MidBoxBegin);
             this.groupBoxWithBorder1.Controls.Add(this.label16);
-            this.groupBoxWithBorder1.Controls.Add(this.PowerSetting);
             this.groupBoxWithBorder1.Controls.Add(this.SingleBoxEnd);
             this.groupBoxWithBorder1.Controls.Add(this.SingleBoxBegin);
             this.groupBoxWithBorder1.Controls.Add(this.label12);
@@ -792,19 +756,6 @@
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = " 打印参数设置";
             // 
-            // ExportData
-            // 
-            this.ExportData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.ExportData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ExportData.Location = new System.Drawing.Point(69, 164);
-            this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.ExportData.Name = "ExportData";
-            this.ExportData.Size = new System.Drawing.Size(68, 26);
-            this.ExportData.TabIndex = 91;
-            this.ExportData.Text = "导出数据";
-            this.ExportData.UseVisualStyleBackColor = true;
-            this.ExportData.Click += new System.EventHandler(this.ExportData_Click);
-            // 
             // label18
             // 
             this.label18.AutoSize = true;
@@ -849,18 +800,6 @@
             this.label16.TabIndex = 87;
             this.label16.Text = "-";
             // 
-            // PowerSetting
-            // 
-            this.PowerSetting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PowerSetting.Location = new System.Drawing.Point(69, 202);
-            this.PowerSetting.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.PowerSetting.Name = "PowerSetting";
-            this.PowerSetting.Size = new System.Drawing.Size(68, 26);
-            this.PowerSetting.TabIndex = 76;
-            this.PowerSetting.Text = "权限设置";
-            this.PowerSetting.UseVisualStyleBackColor = true;
-            this.PowerSetting.Click += new System.EventHandler(this.PowerSetting_Click);
-            // 
             // SingleBoxEnd
             // 
             this.SingleBoxEnd.ID = null;
@@ -1168,6 +1107,189 @@
             this.LabelInf.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelInf_CellValueChanged);
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.Name = "Choose";
+            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 55;
+            // 
+            // pib_ifpick
+            // 
+            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifpick.DataPropertyName = "pib_ifpick";
+            this.pib_ifpick.HeaderText = "已采集";
+            this.pib_ifpick.Name = "pib_ifpick";
+            this.pib_ifpick.Width = 60;
+            // 
+            // pib_ifprint
+            // 
+            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifprint.DataPropertyName = "pib_ifprint";
+            this.pib_ifprint.HeaderText = "已打印";
+            this.pib_ifprint.Name = "pib_ifprint";
+            this.pib_ifprint.Width = 60;
+            // 
+            // pib_id1
+            // 
+            this.pib_id1.DataPropertyName = "pib_id";
+            this.pib_id1.HeaderText = "pib_id";
+            this.pib_id1.Name = "pib_id1";
+            this.pib_id1.Visible = false;
+            this.pib_id1.Width = 66;
+            // 
+            // pib_pdno
+            // 
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_pdno.DataPropertyName = "pib_pdno";
+            this.pib_pdno.HeaderText = "明细序号";
+            this.pib_pdno.Name = "pib_pdno";
+            this.pib_pdno.ReadOnly = true;
+            this.pib_pdno.Width = 96;
+            // 
+            // pib_prodcode
+            // 
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 78;
+            // 
+            // pr_vendprodcode
+            // 
+            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
+            this.pr_vendprodcode.HeaderText = "MPN";
+            this.pr_vendprodcode.Name = "pr_vendprodcode";
+            this.pr_vendprodcode.ReadOnly = true;
+            this.pr_vendprodcode.Width = 48;
+            // 
+            // pib_brand
+            // 
+            this.pib_brand.DataPropertyName = "pib_brand";
+            this.pib_brand.HeaderText = "品牌";
+            this.pib_brand.Name = "pib_brand";
+            this.pib_brand.ReadOnly = true;
+            this.pib_brand.Width = 54;
+            // 
+            // pib_madein
+            // 
+            this.pib_madein.DataPropertyName = "pib_madein";
+            this.pib_madein.HeaderText = "产地";
+            this.pib_madein.Name = "pib_madein";
+            this.pib_madein.Width = 54;
+            // 
+            // pr_zxbzs
+            // 
+            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
+            this.pr_zxbzs.HeaderText = "最小包装数";
+            this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.Visible = false;
+            this.pr_zxbzs.Width = 90;
+            // 
+            // pr_unit
+            // 
+            this.pr_unit.DataPropertyName = "pr_unit";
+            this.pr_unit.HeaderText = "单位";
+            this.pr_unit.Name = "pr_unit";
+            this.pr_unit.Visible = false;
+            this.pr_unit.Width = 54;
+            // 
+            // pib_lotno
+            // 
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.Width = 60;
+            // 
+            // pib_datecode
+            // 
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.Width = 78;
+            // 
+            // pib_datecode1
+            // 
+            this.pib_datecode1.DataPropertyName = "pib_datecode1";
+            this.pib_datecode1.HeaderText = "DateCode1";
+            this.pib_datecode1.Name = "pib_datecode1";
+            this.pib_datecode1.Visible = false;
+            this.pib_datecode1.Width = 84;
+            // 
+            // pib_qty
+            // 
+            this.pib_qty.DataPropertyName = "pib_qty";
+            this.pib_qty.HeaderText = "数量";
+            this.pib_qty.Name = "pib_qty";
+            this.pib_qty.ReadOnly = true;
+            this.pib_qty.Width = 54;
+            // 
+            // pib_barcode
+            // 
+            this.pib_barcode.DataPropertyName = "pib_barcode";
+            this.pib_barcode.HeaderText = "唯一条码";
+            this.pib_barcode.Name = "pib_barcode";
+            this.pib_barcode.ReadOnly = true;
+            this.pib_barcode.Width = 78;
+            // 
+            // pib_custbarcode
+            // 
+            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
+            this.pib_custbarcode.HeaderText = "客户条码";
+            this.pib_custbarcode.Name = "pib_custbarcode";
+            this.pib_custbarcode.ReadOnly = true;
+            this.pib_custbarcode.Width = 78;
+            // 
+            // pd_pocode
+            // 
+            this.pd_pocode.DataPropertyName = "pd_pocode";
+            this.pd_pocode.HeaderText = "客户PO";
+            this.pd_pocode.Name = "pd_pocode";
+            this.pd_pocode.ReadOnly = true;
+            this.pd_pocode.Width = 66;
+            // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "客户料号";
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.ReadOnly = true;
+            this.pd_custprodcode.Width = 78;
+            // 
+            // pd_custprodspec
+            // 
+            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
+            this.pd_custprodspec.HeaderText = "客户型号";
+            this.pd_custprodspec.Name = "pd_custprodspec";
+            this.pd_custprodspec.ReadOnly = true;
+            this.pd_custprodspec.Width = 78;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Visible = false;
+            this.pr_spec.Width = 54;
+            // 
+            // pib_outboxcode1
+            // 
+            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
+            this.pib_outboxcode1.HeaderText = "中盒号";
+            this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.Width = 90;
+            // 
+            // pib_outboxcode2
+            // 
+            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
+            this.pib_outboxcode2.HeaderText = "外箱号";
+            this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.Width = 90;
+            // 
             // pi_inoutno
             // 
             this.pi_inoutno.ID = null;
@@ -1592,188 +1714,57 @@
             this.cu_code.TextBoxEnable = false;
             this.cu_code.UserControlTextChanged += new UAS_LabelMachine.CustomControl.SearchTextBox.OnTextChange(this.cu_code_UserControlTextChanged);
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "勾选";
-            this.Choose.Name = "Choose";
-            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 55;
-            // 
-            // pib_ifpick
-            // 
-            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifpick.DataPropertyName = "pib_ifpick";
-            this.pib_ifpick.HeaderText = "已采集";
-            this.pib_ifpick.Name = "pib_ifpick";
-            this.pib_ifpick.Width = 60;
-            // 
-            // pib_ifprint
-            // 
-            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifprint.DataPropertyName = "pib_ifprint";
-            this.pib_ifprint.HeaderText = "已打印";
-            this.pib_ifprint.Name = "pib_ifprint";
-            this.pib_ifprint.Width = 60;
-            // 
-            // pib_id1
-            // 
-            this.pib_id1.DataPropertyName = "pib_id";
-            this.pib_id1.HeaderText = "pib_id";
-            this.pib_id1.Name = "pib_id1";
-            this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
-            // 
-            // pib_pdno
-            // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_pdno.DataPropertyName = "pib_pdno";
-            this.pib_pdno.HeaderText = "明细序号";
-            this.pib_pdno.Name = "pib_pdno";
-            this.pib_pdno.ReadOnly = true;
-            this.pib_pdno.Width = 96;
-            // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 78;
-            // 
-            // pr_vendprodcode
-            // 
-            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
-            this.pr_vendprodcode.HeaderText = "MPN";
-            this.pr_vendprodcode.Name = "pr_vendprodcode";
-            this.pr_vendprodcode.ReadOnly = true;
-            this.pr_vendprodcode.Width = 48;
-            // 
-            // pib_brand
-            // 
-            this.pib_brand.DataPropertyName = "pib_brand";
-            this.pib_brand.HeaderText = "品牌";
-            this.pib_brand.Name = "pib_brand";
-            this.pib_brand.ReadOnly = true;
-            this.pib_brand.Width = 54;
-            // 
-            // pib_madein
-            // 
-            this.pib_madein.DataPropertyName = "pib_madein";
-            this.pib_madein.HeaderText = "产地";
-            this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Width = 54;
-            // 
-            // pr_zxbzs
-            // 
-            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
-            this.pr_zxbzs.HeaderText = "最小包装数";
-            this.pr_zxbzs.Name = "pr_zxbzs";
-            this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 90;
-            // 
-            // pr_unit
-            // 
-            this.pr_unit.DataPropertyName = "pr_unit";
-            this.pr_unit.HeaderText = "单位";
-            this.pr_unit.Name = "pr_unit";
-            this.pr_unit.Visible = false;
-            this.pr_unit.Width = 54;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.Width = 60;
-            // 
-            // pib_datecode
-            // 
-            this.pib_datecode.DataPropertyName = "pib_datecode";
-            this.pib_datecode.HeaderText = "DateCode";
-            this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 78;
-            // 
-            // pib_datecode1
-            // 
-            this.pib_datecode1.DataPropertyName = "pib_datecode1";
-            this.pib_datecode1.HeaderText = "DateCode1";
-            this.pib_datecode1.Name = "pib_datecode1";
-            this.pib_datecode1.Visible = false;
-            this.pib_datecode1.Width = 84;
-            // 
-            // pib_qty
-            // 
-            this.pib_qty.DataPropertyName = "pib_qty";
-            this.pib_qty.HeaderText = "数量";
-            this.pib_qty.Name = "pib_qty";
-            this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 54;
-            // 
-            // pib_barcode
+            // MenuSetting
             // 
-            this.pib_barcode.DataPropertyName = "pib_barcode";
-            this.pib_barcode.HeaderText = "唯一条码";
-            this.pib_barcode.Name = "pib_barcode";
-            this.pib_barcode.ReadOnly = true;
-            this.pib_barcode.Width = 78;
+            this.MenuSetting.Location = new System.Drawing.Point(230, 112);
+            this.MenuSetting.Name = "MenuSetting";
+            this.MenuSetting.Size = new System.Drawing.Size(88, 23);
+            this.MenuSetting.TabIndex = 89;
+            this.MenuSetting.Text = "后台管理";
+            this.MenuSetting.UseVisualStyleBackColor = true;
+            this.MenuSetting.Click += new System.EventHandler(this.MenuSetting_Click);
             // 
-            // pib_custbarcode
+            // Menu
             // 
-            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
-            this.pib_custbarcode.HeaderText = "客户条码";
-            this.pib_custbarcode.Name = "pib_custbarcode";
-            this.pib_custbarcode.ReadOnly = true;
-            this.pib_custbarcode.Width = 78;
+            this.Menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem1,
+            this.toolStripMenuItem2,
+            this.toolStripMenuItem3,
+            this.toolStripMenuItem4,
+            this.toolStripMenuItem5});
+            this.Menu.Name = "Menu";
+            this.Menu.Size = new System.Drawing.Size(149, 114);
+            this.Menu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.Menu_ItemClicked);
             // 
-            // pd_pocode
+            // toolStripMenuItem1
             // 
-            this.pd_pocode.DataPropertyName = "pd_pocode";
-            this.pd_pocode.HeaderText = "客户PO";
-            this.pd_pocode.Name = "pd_pocode";
-            this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 66;
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem1.Text = "采集策略设置";
             // 
-            // pd_custprodcode
+            // toolStripMenuItem2
             // 
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "客户料号";
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.ReadOnly = true;
-            this.pd_custprodcode.Width = 78;
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem2.Text = "附加信息设置";
             // 
-            // pd_custprodspec
+            // toolStripMenuItem3
             // 
-            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
-            this.pd_custprodspec.HeaderText = "客户型号";
-            this.pd_custprodspec.Name = "pd_custprodspec";
-            this.pd_custprodspec.ReadOnly = true;
-            this.pd_custprodspec.Width = 78;
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem3.Text = "导出数据";
             // 
-            // pr_spec
+            // toolStripMenuItem4
             // 
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Visible = false;
-            this.pr_spec.Width = 54;
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem4.Text = "权限设置";
             // 
-            // pib_outboxcode1
+            // toolStripMenuItem5
             // 
-            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
-            this.pib_outboxcode1.HeaderText = "中盒号";
-            this.pib_outboxcode1.Name = "pib_outboxcode1";
-            this.pib_outboxcode1.Width = 90;
-            // 
-            // pib_outboxcode2
-            // 
-            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
-            this.pib_outboxcode2.HeaderText = "外箱号";
-            this.pib_outboxcode2.Name = "pib_outboxcode2";
-            this.pib_outboxcode2.Width = 90;
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem5.Text = "标签维护";
             // 
             // UAS_出货标签打印
             // 
@@ -1781,10 +1772,10 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1257, 711);
+            this.Controls.Add(this.MenuSetting);
             this.Controls.Add(this.cu_code);
             this.Controls.Add(this.CleanBarCode);
             this.Controls.Add(this.pi_date);
-            this.Controls.Add(this.AttachInfo);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.GetGridOnly);
@@ -1797,11 +1788,9 @@
             this.Controls.Add(this.CleanDetail);
             this.Controls.Add(this.Si_ItemDGV);
             this.Controls.Add(this.CollectionProcess);
-            this.Controls.Add(this.CollectionSetting);
             this.Controls.Add(this.sg_separator);
             this.Controls.Add(this.sg_separator_label);
             this.Controls.Add(this.SaveGrid);
-            this.Controls.Add(this.LabelMainTain);
             this.Controls.Add(this.GenerateBarCode);
             this.Controls.Add(this.CollectionUnit_label);
             this.Controls.Add(this.CollectionUnit);
@@ -1846,6 +1835,7 @@
             this.OutBoxLabel.ResumeLayout(false);
             this.OutBoxLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.OutboxCapacity)).EndInit();
+            this.Menu.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1909,11 +1899,9 @@
         private System.Windows.Forms.ComboBox CollectionUnit;
         private System.Windows.Forms.Label CollectionUnit_label;
         private System.Windows.Forms.Button GenerateBarCode;
-        private System.Windows.Forms.Button LabelMainTain;
         private System.Windows.Forms.Button SaveGrid;
         private System.Windows.Forms.Label sg_separator_label;
         private CustomControl.EnterTextBox sg_separator;
-        private System.Windows.Forms.Button CollectionSetting;
         private System.Windows.Forms.Label Process;
         private System.Windows.Forms.Label Installed;
         private System.Windows.Forms.Label label13;
@@ -1936,7 +1924,6 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.CheckBox CleanInputAfterCollect;
         private System.Windows.Forms.Button AllCollected;
-        private System.Windows.Forms.Button PowerSetting;
         private System.Windows.Forms.Button GetOutBoxCode;
         private System.Windows.Forms.LinkLabel LogingOut;
         private System.Windows.Forms.CheckBox GetGridOnly;
@@ -1959,7 +1946,6 @@
         private System.Windows.Forms.Label label18;
         private CustomControl.EnterTextBox MidBoxEnd;
         private CustomControl.EnterTextBox MidBoxBegin;
-        private System.Windows.Forms.Button ExportData;
         private System.Windows.Forms.FolderBrowserDialog ExportFileDialog;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_detno;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_index;
@@ -1969,7 +1955,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn si_expression;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_item;
         private System.Windows.Forms.DataGridViewTextBoxColumn si_expressionitem;
-        private System.Windows.Forms.Button AttachInfo;
         private System.Windows.Forms.Label pi_date;
         private System.Windows.Forms.Button CleanBarCode;
         private CustomControl.SearchTextBox cu_code;
@@ -2002,5 +1987,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
+        private System.Windows.Forms.Button MenuSetting;
+        private System.Windows.Forms.ContextMenuStrip Menu;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
     }
 }

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

@@ -283,37 +283,13 @@ namespace UAS_LabelMachine
             form.ShowDialog();
         }
 
-        private void CollectionSetting_Click(object sender, EventArgs e)
-        {
-            采集策略 form = new 采集策略(sg_code.Text);
-            form.FormClosed += sg_code_UserControlTextChanged;
-            BaseUtil.SetFormCenter(form);
-            form.ShowDialog();
-        }
-
-        private void LabelMaintain_Click(object sender, EventArgs e)
-        {
-            客户标签维护 form = new 客户标签维护();
-            BaseUtil.SetFormCenter(form);
-            if (SingleDoc != null)
-                SingleDoc.Close();
-            if (MidDoc != null)
-                MidDoc.Close();
-            if (OutBoxDoc != null)
-                OutBoxDoc.Close();
-            form.FormClosed += LabelFormClose;
-            form.ShowDialog();
-        }
-
         private void LabelFormClose(object sender, EventArgs e)
         {
             if (GetGridOnly.Checked)
                 GetInOutInfAndLabelFile();
             else
             {
-                GetGridOnly.Checked = true;
                 GetInOutInfAndLabelFile();
-                GetGridOnly.Checked = false;
             }
         }
 
@@ -1801,13 +1777,6 @@ namespace UAS_LabelMachine
             }
         }
 
-        private void PowerSetting_Click(object sender, EventArgs e)
-        {
-            PowerSetting pw = new PowerSetting();
-            BaseUtil.SetFormCenter(pw);
-            pw.ShowDialog();
-        }
-
         private void GetOutBoxCode_Click(object sender, EventArgs e)
         {
             if (dh.GetConfig("UsingPacking", "ProdInOut!Sale").ToString() != "")
@@ -2016,58 +1985,7 @@ namespace UAS_LabelMachine
 
         private void ExportData_Click(object sender, EventArgs e)
         {
-            ExportFileDialog.Description = "选择导出的路径";
-            DialogResult result = ExportFileDialog.ShowDialog();
-            if (result == DialogResult.OK)
-            {
-                ExcelHandler eh = new ExcelHandler();
-                DataTable dt = ((DataTable)LabelInf.DataSource).Copy();
-                for (int i = dt.Columns.Count - 1; i >= 0; i--)
-                {
-                    for (int j = 0; j < LabelInf.Columns.Count; j++)
-                    {
-                        //去除ID列
-                        if (dt.Columns[i].ColumnName.ToLower().Contains("id") || dt.Columns[i].ColumnName.ToLower() == "pib_barcode" || dt.Columns[i].ColumnName.ToLower() == "pib_pdno" || dt.Columns[i].ColumnName.ToLower() == "pib_ifpick" || dt.Columns[i].ColumnName.ToLower() == "pib_ifprint" || dt.Columns[i].ColumnName.ToLower() == "pib_datecode1" || dt.Columns[i].ColumnName.ToLower() == "pr_vendprodcode")
-                        {
-                            dt.Columns.RemoveAt(i);
-                            break;
-                        }
-                        switch (dt.Columns[i].ColumnName.ToLower())
-                        {
-                            case "pib_lotno":
-                                dt.Columns[i].ColumnName = "批次号";
-                                break;
-                            case "pib_datecode":
-                                dt.Columns[i].ColumnName = "生产日期";
-                                break;
-                            case "pib_custbarcode":
-                                dt.Columns[i].ColumnName = "最小产品包装条码";
-                                break;
-                            default:
-                                break;
-                        }
-                        if (dt.Columns[i].ColumnName.ToLower() == LabelInf.Columns[j].DataPropertyName.ToLower())
-                        {
-                            dt.Columns[i].ColumnName = LabelInf.Columns[j].HeaderText;
-                            break;
-                        }
-                    }
-                }
-                eh.ExportExcel(dt, ExportFileDialog.SelectedPath, pi_date.Text + "-" + pi_inoutno.Text);
-                string close = MessageBox.Show(this.ParentForm, "导出成功,是否打开文件", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                if (close.ToString() == "Yes")
-                    System.Diagnostics.Process.Start(ExportFileDialog.SelectedPath + "\\" + pi_date.Text + "-" + pi_inoutno.Text + ".xls");
-            }
-        }
 
-        private void AttachInfo_Click(object sender, EventArgs e)
-        {
-            if (cu_code.Text != "")
-            {
-                附件内容打印 att = new 附件内容打印(cu_code.Text);
-                att.ShowDialog();
-            }
-            else MessageBox.Show("请先获取出库单信息");
         }
 
         private void MidBoxCapacity_Leave(object sender, EventArgs e)
@@ -2093,6 +2011,7 @@ namespace UAS_LabelMachine
             string close = MessageBox.Show(this.ParentForm, "是否清除该出货单条码", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
             if (close.ToString() == "Yes")
             {
+                sdh.ExecuteSql("delete from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "'", "delete");
                 dh.ExecuteSql("delete from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "'", "delete");
                 LoadGridData(sender, e);
             }
@@ -2184,5 +2103,100 @@ namespace UAS_LabelMachine
             if (!InitGetLabel)
                 GetInOutInfAndLabelFile();
         }
+
+        private void MenuSetting_Click(object sender, EventArgs e)
+        {
+            Menu.Show(new Point(MenuSetting.Location.X, MenuSetting.Location.Y + 20));
+        }
+
+        private void Menu_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+        {
+            switch (e.ClickedItem.Text)
+            {
+                case "采集策略设置":
+                    采集策略 form = new 采集策略(sg_code.Text);
+                    form.FormClosed += sg_code_UserControlTextChanged;
+                    BaseUtil.SetFormCenter(form);
+                    form.ShowDialog();
+                    break;
+                case "附件信息设置":
+                    if (cu_code.Text != "")
+                    {
+                        附件内容打印 att = new 附件内容打印(cu_code.Text);
+                        att.ShowDialog();
+                    }
+                    else MessageBox.Show("请先获取出库单信息");
+                    break;
+                case "标签维护":
+                    客户标签维护 form1 = new 客户标签维护();
+                    BaseUtil.SetFormCenter(form1);
+                    if (SingleDoc != null)
+                        SingleDoc.Close();
+                    if (MidDoc != null)
+                        MidDoc.Close();
+                    if (OutBoxDoc != null)
+                        OutBoxDoc.Close();
+                    if (SingleFormat != null)
+                        SingleFormat.Close(SaveOptions.DoNotSaveChanges);
+                    if (MidFormat != null)
+                        MidFormat.Close(SaveOptions.DoNotSaveChanges);
+                    if (OutFormat != null)
+                        OutFormat.Close(SaveOptions.DoNotSaveChanges);
+                    form1.FormClosed += LabelFormClose;
+                    form1.ShowDialog();
+                    break;
+                case "导出数据":
+                    ExportFileDialog.Description = "选择导出的路径";
+                    DialogResult result = ExportFileDialog.ShowDialog();
+                    if (result == DialogResult.OK)
+                    {
+                        ExcelHandler eh = new ExcelHandler();
+                        DataTable dt = ((DataTable)LabelInf.DataSource).Copy();
+                        for (int i = dt.Columns.Count - 1; i >= 0; i--)
+                        {
+                            for (int j = 0; j < LabelInf.Columns.Count; j++)
+                            {
+                                //去除ID列
+                                if (dt.Columns[i].ColumnName.ToLower().Contains("id") || dt.Columns[i].ColumnName.ToLower() == "pib_barcode" || dt.Columns[i].ColumnName.ToLower() == "pib_pdno" || dt.Columns[i].ColumnName.ToLower() == "pib_ifpick" || dt.Columns[i].ColumnName.ToLower() == "pib_ifprint" || dt.Columns[i].ColumnName.ToLower() == "pib_datecode1" || dt.Columns[i].ColumnName.ToLower() == "pr_vendprodcode")
+                                {
+                                    dt.Columns.RemoveAt(i);
+                                    break;
+                                }
+                                switch (dt.Columns[i].ColumnName.ToLower())
+                                {
+                                    case "pib_lotno":
+                                        dt.Columns[i].ColumnName = "批次号";
+                                        break;
+                                    case "pib_datecode":
+                                        dt.Columns[i].ColumnName = "生产日期";
+                                        break;
+                                    case "pib_custbarcode":
+                                        dt.Columns[i].ColumnName = "最小产品包装条码";
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                if (dt.Columns[i].ColumnName.ToLower() == LabelInf.Columns[j].DataPropertyName.ToLower())
+                                {
+                                    dt.Columns[i].ColumnName = LabelInf.Columns[j].HeaderText;
+                                    break;
+                                }
+                            }
+                        }
+                        eh.ExportExcel(dt, ExportFileDialog.SelectedPath, pi_date.Text + "-" + pi_inoutno.Text);
+                        string close = MessageBox.Show(this.ParentForm, "导出成功,是否打开文件", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                        if (close.ToString() == "Yes")
+                            System.Diagnostics.Process.Start(ExportFileDialog.SelectedPath + "\\" + pi_date.Text + "-" + pi_inoutno.Text + ".xls");
+                    }
+                    break;
+                case "权限设置":
+                    PowerSetting pw = new PowerSetting();
+                    BaseUtil.SetFormCenter(pw);
+                    pw.ShowDialog();
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 }

+ 3 - 0
UAS-出货标签管理(贸易版)/UAS_出货标签管理.resx

@@ -171,6 +171,9 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>442, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

+ 1 - 2
UAS-出货标签管理(贸易版)/客户标签维护.cs

@@ -60,7 +60,6 @@ namespace UAS_LabelMachine
         public 客户标签维护()
         {
             InitializeComponent();
-
             cu_code.FormName = Name;
             cu_code.SetValueField = new string[] { "cu_code", "cu_name" };
             cu_code.TableName = "(select distinct cu_code,cu_name from customer left join customerlabel on cu_code=cl_custcode)";
@@ -77,7 +76,7 @@ namespace UAS_LabelMachine
             la_code.SelectField = "la_code # 模板编号,la_name # 模板名称";
             NetURL.Text = Settings.Default.ShareUrl;
         }
-        
+
         private void 条码维护_Load(object sender, EventArgs e)
         {
             dh = SystemInf.dh;