修改标签打印客户标签维护界面的布局

UAS-出货标签管理/App.config

@@ -25,7 +25,7 @@
         <value />
       </setting>
       <setting name="FTPAddress" serializeAs="String">
-        <value>ftp://sz.hi-mantech.com:46688#yhndftp#Stga28ytG8</value>
+        <value>ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</value>
       </setting>
     </UAS_LabelMachine.Properties.Settings>
   </userSettings>

UAS-出货标签管理/Properties/Settings.Designer.cs

@@ -73,7 +73,7 @@ namespace UAS_LabelMachine.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://sz.hi-mantech.com:46688#yhndftp#Stga28ytG8")]
+        [global::System.Configuration.DefaultSettingValueAttribute("ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8")]
         public string FTPAddress {
             get {
                 return ((string)(this["FTPAddress"]));

UAS-出货标签管理/Properties/Settings.settings

@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ftp://sz.hi-mantech.com:46688#yhndftp#Stga28ytG8</Value>
+      <Value Profile="(Default)">ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</Value>
     </Setting>
   </Settings>
 </SettingsFile>

UAS-出货标签管理/客户标签维护.Designer.cs

@@ -33,15 +33,12 @@ namespace UAS_LabelMachine
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(客户标签维护));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.cl_code_label = new System.Windows.Forms.Label();
             this.cu_name_label = new System.Windows.Forms.Label();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.CodeSoft = new System.Windows.Forms.RadioButton();
-            this.Bartender = new System.Windows.Forms.RadioButton();
-            this.labelSoft_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.PrinterList_lable = new System.Windows.Forms.Label();
             this.OpenFolder = new System.Windows.Forms.Button();
@@ -86,6 +83,7 @@ namespace UAS_LabelMachine
             this.FTPShare = new System.Windows.Forms.CheckBox();
             this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
             this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
+            this.CodeSoft = new System.Windows.Forms.RadioButton();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -93,9 +91,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_code_label.AutoSize = true;
             this.cl_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_code_label.Location = new System.Drawing.Point(31, 15);
+            this.cl_code_label.Location = new System.Drawing.Point(41, 19);
+            this.cl_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_code_label.Name = "cl_code_label";
-            this.cl_code_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_code_label.Size = new System.Drawing.Size(92, 27);
             this.cl_code_label.TabIndex = 145;
             this.cl_code_label.Text = "客户编号";
             // 
@@ -103,9 +102,10 @@ namespace UAS_LabelMachine
             // 
             this.cu_name_label.AutoSize = true;
             this.cu_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_name_label.Location = new System.Drawing.Point(325, 16);
+            this.cu_name_label.Location = new System.Drawing.Point(433, 20);
+            this.cu_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cu_name_label.Name = "cu_name_label";
-            this.cu_name_label.Size = new System.Drawing.Size(74, 21);
+            this.cu_name_label.Size = new System.Drawing.Size(92, 27);
             this.cu_name_label.TabIndex = 144;
             this.cu_name_label.Text = "客户名称";
             // 
@@ -113,48 +113,14 @@ namespace UAS_LabelMachine
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
             // 
-            // CodeSoft
-            // 
-            this.CodeSoft.AutoSize = true;
-            this.CodeSoft.Checked = true;
-            this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CodeSoft.Location = new System.Drawing.Point(1147, 16);
-            this.CodeSoft.Name = "CodeSoft";
-            this.CodeSoft.Size = new System.Drawing.Size(99, 25);
-            this.CodeSoft.TabIndex = 161;
-            this.CodeSoft.TabStop = true;
-            this.CodeSoft.Text = "CodeSoft";
-            this.CodeSoft.UseVisualStyleBackColor = true;
-            // 
-            // Bartender
-            // 
-            this.Bartender.AutoSize = true;
-            this.Bartender.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Bartender.Location = new System.Drawing.Point(1022, 16);
-            this.Bartender.Name = "Bartender";
-            this.Bartender.Size = new System.Drawing.Size(106, 25);
-            this.Bartender.TabIndex = 162;
-            this.Bartender.Text = "BarTender";
-            this.Bartender.UseVisualStyleBackColor = true;
-            this.Bartender.Visible = false;
-            // 
-            // labelSoft_label
-            // 
-            this.labelSoft_label.AutoSize = true;
-            this.labelSoft_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelSoft_label.Location = new System.Drawing.Point(1036, 18);
-            this.labelSoft_label.Name = "labelSoft_label";
-            this.labelSoft_label.Size = new System.Drawing.Size(74, 21);
-            this.labelSoft_label.TabIndex = 163;
-            this.labelSoft_label.Text = "模板软件";
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1050, 109);
+            this.label1.Location = new System.Drawing.Point(1225, 111);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 21);
+            this.label1.Size = new System.Drawing.Size(132, 27);
             this.label1.TabIndex = 164;
             this.label1.Text = "模板参数预览";
             // 
@@ -162,17 +128,19 @@ namespace UAS_LabelMachine
             // 
             this.PrinterList_lable.AutoSize = true;
             this.PrinterList_lable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_lable.Location = new System.Drawing.Point(1020, 48);
+            this.PrinterList_lable.Location = new System.Drawing.Point(1227, 26);
+            this.PrinterList_lable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_lable.Name = "PrinterList_lable";
-            this.PrinterList_lable.Size = new System.Drawing.Size(90, 21);
+            this.PrinterList_lable.Size = new System.Drawing.Size(112, 27);
             this.PrinterList_lable.TabIndex = 175;
             this.PrinterList_lable.Text = "打印机列表";
             // 
             // OpenFolder
             // 
-            this.OpenFolder.Location = new System.Drawing.Point(582, 548);
+            this.OpenFolder.Location = new System.Drawing.Point(776, 612);
+            this.OpenFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OpenFolder.Name = "OpenFolder";
-            this.OpenFolder.Size = new System.Drawing.Size(75, 27);
+            this.OpenFolder.Size = new System.Drawing.Size(100, 34);
             this.OpenFolder.TabIndex = 156;
             this.OpenFolder.Text = "打开";
             this.OpenFolder.UseVisualStyleBackColor = true;
@@ -182,27 +150,30 @@ namespace UAS_LabelMachine
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(302, 511);
+            this.label3.Location = new System.Drawing.Point(403, 566);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 171;
             this.label3.Text = "盘标类型";
             // 
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(398, 551);
+            this.FolderPath.Location = new System.Drawing.Point(531, 616);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(161, 21);
+            this.FolderPath.Size = new System.Drawing.Size(213, 25);
             this.FolderPath.TabIndex = 157;
             // 
             // FolderPath_Label
             // 
             this.FolderPath_Label.AutoSize = true;
             this.FolderPath_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.FolderPath_Label.Location = new System.Drawing.Point(302, 551);
+            this.FolderPath_Label.Location = new System.Drawing.Point(403, 616);
+            this.FolderPath_Label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.FolderPath_Label.Name = "FolderPath_Label";
-            this.FolderPath_Label.Size = new System.Drawing.Size(74, 21);
+            this.FolderPath_Label.Size = new System.Drawing.Size(92, 27);
             this.FolderPath_Label.TabIndex = 158;
             this.FolderPath_Label.Text = "模板路径";
             // 
@@ -215,18 +186,20 @@ namespace UAS_LabelMachine
             "单盘",
             "中盒",
             "外箱"});
-            this.la_type1.Location = new System.Drawing.Point(398, 512);
+            this.la_type1.Location = new System.Drawing.Point(531, 567);
+            this.la_type1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.la_type1.Name = "la_type1";
-            this.la_type1.Size = new System.Drawing.Size(161, 20);
+            this.la_type1.Size = new System.Drawing.Size(213, 23);
             this.la_type1.TabIndex = 169;
             // 
             // cl_custcode_label
             // 
             this.cl_custcode_label.AutoSize = true;
             this.cl_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_custcode_label.Location = new System.Drawing.Point(20, 508);
+            this.cl_custcode_label.Location = new System.Drawing.Point(27, 562);
+            this.cl_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_custcode_label.Name = "cl_custcode_label";
-            this.cl_custcode_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_custcode_label.Size = new System.Drawing.Size(92, 27);
             this.cl_custcode_label.TabIndex = 167;
             this.cl_custcode_label.Text = "客户编号";
             // 
@@ -240,27 +213,30 @@ namespace UAS_LabelMachine
             // 
             this.la_code_label.AutoSize = true;
             this.la_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_code_label.Location = new System.Drawing.Point(583, 511);
+            this.la_code_label.Location = new System.Drawing.Point(777, 566);
+            this.la_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_code_label.Name = "la_code_label";
-            this.la_code_label.Size = new System.Drawing.Size(74, 21);
+            this.la_code_label.Size = new System.Drawing.Size(92, 27);
             this.la_code_label.TabIndex = 178;
             this.la_code_label.Text = "模板编号";
             // 
             // LabelParam
             // 
             this.LabelParam.AutoScroll = true;
-            this.LabelParam.Location = new System.Drawing.Point(1054, 133);
+            this.LabelParam.Location = new System.Drawing.Point(1230, 147);
+            this.LabelParam.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.LabelParam.Name = "LabelParam";
-            this.LabelParam.Size = new System.Drawing.Size(270, 372);
+            this.LabelParam.Size = new System.Drawing.Size(328, 400);
             this.LabelParam.TabIndex = 180;
             // 
             // NetURL_label
             // 
             this.NetURL_label.AutoSize = true;
             this.NetURL_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NetURL_label.Location = new System.Drawing.Point(1036, 82);
+            this.NetURL_label.Location = new System.Drawing.Point(1248, 61);
+            this.NetURL_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.NetURL_label.Name = "NetURL_label";
-            this.NetURL_label.Size = new System.Drawing.Size(74, 21);
+            this.NetURL_label.Size = new System.Drawing.Size(92, 27);
             this.NetURL_label.TabIndex = 181;
             this.NetURL_label.Text = "网络路径";
             // 
@@ -268,9 +244,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_labeltype_label.AutoSize = true;
             this.cl_labeltype_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_labeltype_label.Location = new System.Drawing.Point(609, 15);
+            this.cl_labeltype_label.Location = new System.Drawing.Point(812, 19);
+            this.cl_labeltype_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.cl_labeltype_label.Name = "cl_labeltype_label";
-            this.cl_labeltype_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_labeltype_label.Size = new System.Drawing.Size(92, 27);
             this.cl_labeltype_label.TabIndex = 185;
             this.cl_labeltype_label.Text = "盘标类型";
             // 
@@ -279,9 +256,10 @@ namespace UAS_LabelMachine
             this.la_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.la_type.DropDownWidth = 161;
             this.la_type.FormattingEnabled = true;
-            this.la_type.Location = new System.Drawing.Point(705, 16);
+            this.la_type.Location = new System.Drawing.Point(940, 20);
+            this.la_type.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.la_type.Name = "la_type";
-            this.la_type.Size = new System.Drawing.Size(161, 20);
+            this.la_type.Size = new System.Drawing.Size(213, 23);
             this.la_type.TabIndex = 184;
             this.la_type.Tag = "cl_labeltype";
             // 
@@ -289,27 +267,30 @@ namespace UAS_LabelMachine
             // 
             this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.la_name.Location = new System.Drawing.Point(116, 551);
+            this.la_name.Location = new System.Drawing.Point(155, 616);
+            this.la_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.la_name.Name = "la_name";
-            this.la_name.Size = new System.Drawing.Size(137, 21);
+            this.la_name.Size = new System.Drawing.Size(0, 25);
             this.la_name.TabIndex = 186;
             // 
             // la_name_label
             // 
             this.la_name_label.AutoSize = true;
             this.la_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_name_label.Location = new System.Drawing.Point(20, 551);
+            this.la_name_label.Location = new System.Drawing.Point(27, 616);
+            this.la_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.la_name_label.Name = "la_name_label";
-            this.la_name_label.Size = new System.Drawing.Size(74, 21);
+            this.la_name_label.Size = new System.Drawing.Size(92, 27);
             this.la_name_label.TabIndex = 187;
             this.la_name_label.Text = "模板名称";
             // 
             // NetURL
             // 
             this.NetURL.ID = null;
-            this.NetURL.Location = new System.Drawing.Point(1126, 82);
+            this.NetURL.Location = new System.Drawing.Point(1368, 61);
+            this.NetURL.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NetURL.Name = "NetURL";
-            this.NetURL.Size = new System.Drawing.Size(189, 21);
+            this.NetURL.Size = new System.Drawing.Size(161, 25);
             this.NetURL.Str = null;
             this.NetURL.Str1 = null;
             this.NetURL.Str2 = null;
@@ -322,11 +303,12 @@ namespace UAS_LabelMachine
             this.la_code.Caller = null;
             this.la_code.Condition = null;
             this.la_code.FormName = null;
-            this.la_code.Location = new System.Drawing.Point(679, 514);
+            this.la_code.Location = new System.Drawing.Point(905, 569);
+            this.la_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.la_code.Name = "la_code";
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
-            this.la_code.Size = new System.Drawing.Size(161, 21);
+            this.la_code.Size = new System.Drawing.Size(215, 26);
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
@@ -334,9 +316,10 @@ namespace UAS_LabelMachine
             // Save
             // 
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
-            this.Save.Location = new System.Drawing.Point(765, 546);
+            this.Save.Location = new System.Drawing.Point(1020, 613);
+            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Save.Name = "Save";
-            this.Save.Size = new System.Drawing.Size(75, 29);
+            this.Save.Size = new System.Drawing.Size(81, 30);
             this.Save.TabIndex = 170;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -345,18 +328,20 @@ namespace UAS_LabelMachine
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(17, 97);
+            this.ChooseAll.Location = new System.Drawing.Point(23, 112);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(51, 23);
+            this.ChooseAll.Size = new System.Drawing.Size(45, 26);
             this.ChooseAll.TabIndex = 177;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1126, 49);
+            this.PrinterList.Location = new System.Drawing.Point(1368, 27);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(189, 20);
+            this.PrinterList.Size = new System.Drawing.Size(161, 25);
             this.PrinterList.TabIndex = 174;
             // 
             // LabelDataGridView
@@ -378,21 +363,22 @@ namespace UAS_LabelMachine
             this.cl_detno,
             this.cl_labelsoft,
             this.cl_status});
-            this.LabelDataGridView.Location = new System.Drawing.Point(17, 112);
+            this.LabelDataGridView.Location = new System.Drawing.Point(23, 112);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.LabelDataGridView.Name = "LabelDataGridView";
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.Blue;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.LabelDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.White;
-            this.LabelDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Blue;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.LabelDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
+            this.LabelDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle2;
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.LabelDataGridView.Size = new System.Drawing.Size(1021, 393);
+            this.LabelDataGridView.Size = new System.Drawing.Size(1186, 435);
             this.LabelDataGridView.TabIndex = 172;
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
             this.LabelDataGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.LabelDataGridView_CellFormatting);
@@ -487,9 +473,10 @@ namespace UAS_LabelMachine
             // PrintTest
             // 
             this.PrintTest.Image = ((System.Drawing.Image)(resources.GetObject("PrintTest.Image")));
-            this.PrintTest.Location = new System.Drawing.Point(1155, 523);
+            this.PrintTest.Location = new System.Drawing.Point(1354, 569);
+            this.PrintTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintTest.Name = "PrintTest";
-            this.PrintTest.Size = new System.Drawing.Size(75, 29);
+            this.PrintTest.Size = new System.Drawing.Size(81, 30);
             this.PrintTest.TabIndex = 166;
             this.PrintTest.Tag = "Print";
             this.PrintTest.Text = "打印测试";
@@ -501,11 +488,12 @@ namespace UAS_LabelMachine
             this.客户编号.Caller = null;
             this.客户编号.Condition = null;
             this.客户编号.FormName = null;
-            this.客户编号.Location = new System.Drawing.Point(116, 511);
+            this.客户编号.Location = new System.Drawing.Point(155, 566);
+            this.客户编号.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.客户编号.Name = "客户编号";
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
-            this.客户编号.Size = new System.Drawing.Size(161, 21);
+            this.客户编号.Size = new System.Drawing.Size(181, 26);
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
@@ -515,11 +503,12 @@ namespace UAS_LabelMachine
             this.cu_code.Caller = null;
             this.cu_code.Condition = null;
             this.cu_code.FormName = null;
-            this.cu_code.Location = new System.Drawing.Point(127, 16);
+            this.cu_code.Location = new System.Drawing.Point(169, 20);
+            this.cu_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cu_code.Name = "cu_code";
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
-            this.cu_code.Size = new System.Drawing.Size(150, 21);
+            this.cu_code.Size = new System.Drawing.Size(200, 26);
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
@@ -527,9 +516,10 @@ namespace UAS_LabelMachine
             // UpdateGrid
             // 
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
-            this.UpdateGrid.Location = new System.Drawing.Point(695, 59);
+            this.UpdateGrid.Location = new System.Drawing.Point(927, 61);
+            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.UpdateGrid.Name = "UpdateGrid";
-            this.UpdateGrid.Size = new System.Drawing.Size(75, 29);
+            this.UpdateGrid.Size = new System.Drawing.Size(81, 30);
             this.UpdateGrid.TabIndex = 154;
             this.UpdateGrid.Tag = "IfWrite";
             this.UpdateGrid.Text = "更新";
@@ -539,9 +529,10 @@ namespace UAS_LabelMachine
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
-            this.Screen.Location = new System.Drawing.Point(582, 59);
+            this.Screen.Location = new System.Drawing.Point(776, 61);
+            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Screen.Name = "Screen";
-            this.Screen.Size = new System.Drawing.Size(75, 29);
+            this.Screen.Size = new System.Drawing.Size(81, 30);
             this.Screen.TabIndex = 153;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "筛选";
@@ -551,9 +542,10 @@ namespace UAS_LabelMachine
             // cu_name
             // 
             this.cu_name.ID = null;
-            this.cu_name.Location = new System.Drawing.Point(419, 16);
+            this.cu_name.Location = new System.Drawing.Point(559, 20);
+            this.cu_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cu_name.Name = "cu_name";
-            this.cu_name.Size = new System.Drawing.Size(150, 21);
+            this.cu_name.Size = new System.Drawing.Size(199, 25);
             this.cu_name.Str = null;
             this.cu_name.Str1 = null;
             this.cu_name.Str2 = null;
@@ -565,9 +557,10 @@ namespace UAS_LabelMachine
             this.FTPShare.AutoSize = true;
             this.FTPShare.Checked = true;
             this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.FTPShare.Location = new System.Drawing.Point(679, 555);
+            this.FTPShare.Location = new System.Drawing.Point(905, 621);
+            this.FTPShare.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.FTPShare.Name = "FTPShare";
-            this.FTPShare.Size = new System.Drawing.Size(66, 16);
+            this.FTPShare.Size = new System.Drawing.Size(83, 19);
             this.FTPShare.TabIndex = 188;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
@@ -575,9 +568,10 @@ namespace UAS_LabelMachine
             // NewLabel
             // 
             this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
-            this.NewLabel.Location = new System.Drawing.Point(846, 546);
+            this.NewLabel.Location = new System.Drawing.Point(1128, 613);
+            this.NewLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.NewLabel.Name = "NewLabel";
-            this.NewLabel.Size = new System.Drawing.Size(75, 29);
+            this.NewLabel.Size = new System.Drawing.Size(81, 30);
             this.NewLabel.TabIndex = 189;
             this.NewLabel.Tag = "IfWrite";
             this.NewLabel.Text = "新增标签";
@@ -588,16 +582,32 @@ namespace UAS_LabelMachine
             // 
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pagination1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pagination1.Location = new System.Drawing.Point(0, 590);
+            this.pagination1.Location = new System.Drawing.Point(0, 663);
+            this.pagination1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1338, 32);
+            this.pagination1.Size = new System.Drawing.Size(1572, 40);
             this.pagination1.TabIndex = 190;
             // 
+            // CodeSoft
+            // 
+            this.CodeSoft.AutoSize = true;
+            this.CodeSoft.Checked = true;
+            this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CodeSoft.Location = new System.Drawing.Point(1410, 107);
+            this.CodeSoft.Margin = new System.Windows.Forms.Padding(4);
+            this.CodeSoft.Name = "CodeSoft";
+            this.CodeSoft.Size = new System.Drawing.Size(122, 31);
+            this.CodeSoft.TabIndex = 161;
+            this.CodeSoft.TabStop = true;
+            this.CodeSoft.Text = "CodeSoft";
+            this.CodeSoft.UseVisualStyleBackColor = true;
+            this.CodeSoft.Visible = false;
+            // 
             // 客户标签维护
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1338, 622);
+            this.ClientSize = new System.Drawing.Size(1572, 703);
             this.Controls.Add(this.pagination1);
             this.Controls.Add(this.NewLabel);
             this.Controls.Add(this.FTPShare);
@@ -624,8 +634,6 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.PrintTest);
             this.Controls.Add(this.客户编号);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.labelSoft_label);
-            this.Controls.Add(this.Bartender);
             this.Controls.Add(this.CodeSoft);
             this.Controls.Add(this.cu_code);
             this.Controls.Add(this.UpdateGrid);
@@ -634,6 +642,7 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cl_code_label);
             this.Controls.Add(this.cu_name_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";
             this.Text = "客户标签维护";
@@ -661,9 +670,6 @@ namespace UAS_LabelMachine
         private TextBox FolderPath;
         private Button OpenFolder;
         private CustomControl.SearchTextBox cu_code;
-        private RadioButton CodeSoft;
-        private RadioButton Bartender;
-        private Label labelSoft_label;
         private Label label1;
         private CustomControl.NormalButton PrintTest;
         private CustomControl.SearchTextBox 客户编号;
@@ -702,5 +708,6 @@ namespace UAS_LabelMachine
         private DataGridViewTextBoxColumn cl_status;
         private NormalButton NewLabel;
         private Pagination pagination1;
+        private RadioButton CodeSoft;
     }
 }

UAS-出货标签管理/客户标签维护.cs

@@ -66,6 +66,7 @@ namespace UAS_LabelMachine
         };
 
         AutoSizeFormClass asc = new AutoSizeFormClass();
+
         public 客户标签维护()
         {
             InitializeComponent();
@@ -97,7 +98,6 @@ namespace UAS_LabelMachine
             dh = new DataHelper();
             condition.Append("");
 
-
             ChooseAll.ChooseAll(LabelDataGridView);
             BaseUtil.SetComboxData(la_type, "display", "value", labeltype);
             //加载下拉框的静态值
@@ -172,15 +172,6 @@ namespace UAS_LabelMachine
                         y = y + 30;
                     }
                 }
-                else if (Bartender.Checked)
-                {
-                    //string ID = LabelDataGridView.Rows[e.RowIndex].Cells["cl_id"].Value.ToString();
-                    //string fileName = LabelDataGridView.Rows[e.RowIndex].Cells["cl_labelurl"].Value.ToString();
-                    ////System.Drawing.Image image = LabelFormatThumbnail.Create(fileName, Color.LightGray, 434, 347);
-                    //BartenderPreview LabelPreView = new BartenderPreview(ID, image);
-                    //LabelPreView.StartPosition = FormStartPosition.CenterParent;
-                    //LabelPreView.ShowDialog();
-                }
             }
             if (LabelDataGridView.Columns[e.ColumnIndex].HeaderText == "编辑")
             {
@@ -228,10 +219,6 @@ namespace UAS_LabelMachine
             {
                 LabelSoft = "CodeSoft";
             }
-            if (Bartender.Checked)
-            {
-                LabelSoft = "Bartender";
-            }
             DataTable dt = (DataTable)LabelDataGridView.DataSource;
             //如果有改变的行才传递到后台
             if (dt.GetChanges() != null)
@@ -264,11 +251,7 @@ namespace UAS_LabelMachine
         private void OpenFolder_Click(object sender, EventArgs e)
         {
             //根据勾选的不同设置不同的文件后缀过滤
-            if (Bartender.Checked)
-            {
-                openFileDialog1.Filter = "(*.btw)|*.btw";
-            }
-            else if (CodeSoft.Checked)
+            if (CodeSoft.Checked)
             {
                 openFileDialog1.Filter = "(*.lab)|*.lab";
             }
@@ -388,7 +371,8 @@ namespace UAS_LabelMachine
                     fileName = la_name.Text;
                     sourcePath = FolderPath.Text;
                 }
-                else {
+                else
+                {
                     sourcePath = openFileDialog1.FileName.Substring(0, openFileDialog1.FileName.LastIndexOf(@"\"));
                     fileName = openFileDialog1.FileName.Substring(openFileDialog1.FileName.LastIndexOf(@"\") + 1);
                 }
@@ -396,14 +380,15 @@ namespace UAS_LabelMachine
                 {
                     ftpOperater ftp = new ftpOperater();
                     ftp.UpLoadFile(sourcePath, fileName);
-                    string SoftWare = Bartender.Checked ? "Bartender" : "CodeSoft";
+                    string SoftWare = "CodeSoft";
                     if (CL_ID2 != null)
                     {
                         sql.Clear();
                         sql.Append("update customerlabel set cl_labelcode='" + la_code.Text + "',cl_custcode='" + 客户编号.Text + "',");
                         sql.Append("cl_labeltype='" + la_type1.Text + "',cl_labelname='" + la_name.Text + "' where cl_id=" + CL_ID2);
                     }
-                    else {
+                    else
+                    {
                         sql.Clear();
                         sql.Append("insert into customerlabel (cl_id,cl_labelcode,cl_custcode,cl_labeltype,cl_labelurl,cl_labelname,cl_labelsoft) values( customerlabel_seq.nextval, ");
                         sql.Append("'" + la_code.Text + "','" + (客户编号.Text == "" ? "" : 客户编号.Text) + "','" + la_type1.Text + "','" + ftpOperater.FTPAddress + "','" + la_name.Text + "','" + SoftWare + "')");
@@ -411,7 +396,8 @@ namespace UAS_LabelMachine
                     dh.ExecuteSql(sql.ToString(), "insert");
                     sql.Clear();
                 }
-                else {
+                else
+                {
                     //目标路径
                     string targetPath = NetURL.Text;
                     //var file = Directory.GetFiles(targetPath);
@@ -435,7 +421,7 @@ namespace UAS_LabelMachine
                             Directory.CreateDirectory(targetPath);
                         //将文件复制到指定位置
                         File.Copy(sourceFile, destFile, true);
-                        string SoftWare = Bartender.Checked ? "Bartender" : "CodeSoft";
+                        string SoftWare = "CodeSoft";
                         sql.Clear();
                         sql.Append("insert into customerlabel (cl_id,cl_labelcode,cl_custcode,cl_labeltype,cl_labelurl,cl_labelname,cl_labelsoft) values( customerlabel_seq.nextval, ");
                         sql.Append("'" + la_code.Text + "','" + (客户编号.Text == "" ? "共用" : 客户编号.Text) + "','" + la_type1.Text + "','" + destFile + "','" + la_name.Text + "','" + SoftWare + "')");