解决项目冲突

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

@@ -10,29 +10,6 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
     <supportedRuntime version="v2.0.50727" />
   </startup>
-  <userSettings>
-    <UAS_LabelMachine.Properties.Settings>
-      <setting name="LastLoginUser" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="IPAddress" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="LastLoginMaster" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="ShareUrl" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="FTPAddress" serializeAs="String">
-<<<<<<< HEAD
-        <value>ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</value>
-=======
-        <value>ftp://richwellgroup.com.cn|printuser|printuser</value>
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
-      </setting>
-    </UAS_LabelMachine.Properties.Settings>
-  </userSettings>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
@@ -59,4 +36,23 @@
         contract="Vivo_BoxReelRelation.Service1Soap" name="Service1Soap1" />
     </client>
   </system.serviceModel>
+  <userSettings>
+    <UAS_LabelMachine.Properties.Settings>
+      <setting name="FTPAddress" serializeAs="String">
+        <value>ftp://richwellgroup.com.cn#printuser#printuser</value>
+      </setting>
+      <setting name="ShareUrl" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="LastLoginMaster" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="IPAddress" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="LastLoginUser" serializeAs="String">
+        <value />
+      </setting>
+    </UAS_LabelMachine.Properties.Settings>
+  </userSettings>
 </configuration>

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

@@ -2,24 +2,20 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="UAS_LabelMachine.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="LastLoginUser" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+    <Setting Name="FTPAddress" Type="System.String" Scope="User">
+      <Value Profile="(Default)">ftp://richwellgroup.com.cn#printuser#printuser</Value>
     </Setting>
-    <Setting Name="IPAddress" Type="System.String" Scope="User">
+    <Setting Name="ShareUrl" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="LastLoginMaster" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ShareUrl" Type="System.String" Scope="User">
+    <Setting Name="IPAddress" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="FTPAddress" Type="System.String" Scope="User">
-<<<<<<< HEAD
-      <Value Profile="(Default)">ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</Value>
-=======
-      <Value Profile="(Default)">ftp://richwellgroup.com.cn|printuser|printuser</Value>
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
+    <Setting Name="LastLoginUser" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
     </Setting>
   </Settings>
 </SettingsFile>

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

@@ -25,25 +25,25 @@ namespace UAS_LabelMachine.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string LastLoginUser {
+        [global::System.Configuration.DefaultSettingValueAttribute("ftp://richwellgroup.com.cn#printuser#printuser")]
+        public string FTPAddress {
             get {
-                return ((string)(this["LastLoginUser"]));
+                return ((string)(this["FTPAddress"]));
             }
             set {
-                this["LastLoginUser"] = value;
+                this["FTPAddress"] = value;
             }
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string IPAddress {
+        public string ShareUrl {
             get {
-                return ((string)(this["IPAddress"]));
+                return ((string)(this["ShareUrl"]));
             }
             set {
-                this["IPAddress"] = value;
+                this["ShareUrl"] = value;
             }
         }
         
@@ -62,28 +62,24 @@ namespace UAS_LabelMachine.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string ShareUrl {
+        public string IPAddress {
             get {
-                return ((string)(this["ShareUrl"]));
+                return ((string)(this["IPAddress"]));
             }
             set {
-                this["ShareUrl"] = value;
+                this["IPAddress"] = value;
             }
         }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-<<<<<<< HEAD
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8")]
-=======
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://richwellgroup.com.cn|printuser|printuser")]
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
-        public string FTPAddress {
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LastLoginUser {
             get {
-                return ((string)(this["FTPAddress"]));
+                return ((string)(this["LastLoginUser"]));
             }
             set {
-                this["FTPAddress"] = value;
+                this["LastLoginUser"] = value;
             }
         }
     }

UAS-出货标签管理/UAS-出货标签管理.csproj

@@ -14,6 +14,14 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkProfile />
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <PublishUrl>ftp://richwellgroup.com.cn/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -37,14 +45,6 @@
     <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -212,6 +212,11 @@
     <Compile Include="PowerSetting.Designer.cs">
       <DependentUpon>PowerSetting.cs</DependentUpon>
     </Compile>
+    <Compile Include="Properties\Settings1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="PublicMethod\ArrayList.cs" />
     <Compile Include="PublicMethod\AutoSizeFormClass.cs" />
     <Compile Include="PublicMethod\BaseUtil.cs" />
@@ -323,13 +328,8 @@
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <None Include="Service References\Vivo_BoxReelRelation\ReelAPI.wsdl" />
     <None Include="Service References\Vivo_BoxReelRelation\UAS_LabelMachine.Vivo_BoxReelRelation.ReelEntity.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>

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

@@ -1609,20 +1609,19 @@
             this.SizeChanged += new System.EventHandler(this.贴标机条码打印_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).EndInit();
-            this.CollectionProcess.ResumeLayout(false);
+            this.CollectionProcess.ResumeLayout(true);
             this.CollectionProcess.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).EndInit();
-            this.SingleLabel.ResumeLayout(false);
+            this.SingleLabel.ResumeLayout(true);
             this.SingleLabel.PerformLayout();
-            this.MidLabel.ResumeLayout(false);
+            this.MidLabel.ResumeLayout(true);
             this.MidLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.MidBoxCapacity)).EndInit();
-            this.OutBoxLabel.ResumeLayout(false);
+            this.OutBoxLabel.ResumeLayout(true);
             this.OutBoxLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.OutboxCapacity)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
-
         }
 
         #endregion

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

@@ -33,13 +33,8 @@ namespace UAS_LabelMachine
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(客户标签维护));
-<<<<<<< HEAD
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-=======
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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();
@@ -61,10 +56,7 @@ namespace UAS_LabelMachine
             this.la_name = new System.Windows.Forms.TextBox();
             this.la_name_label = new System.Windows.Forms.Label();
             this.FTPShare = new System.Windows.Forms.CheckBox();
-<<<<<<< HEAD
-=======
             this.CodeSoft = new System.Windows.Forms.RadioButton();
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
             this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
             this.NetURL = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -99,17 +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)));
-<<<<<<< HEAD
-            this.cl_code_label.Location = new System.Drawing.Point(46, 22);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_code_label.TabIndex = 145;
             this.cl_code_label.Text = "客户编号";
             // 
@@ -117,17 +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)));
-<<<<<<< HEAD
-            this.cu_name_label.Location = new System.Drawing.Point(488, 24);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_name_label.TabIndex = 144;
             this.cu_name_label.Text = "客户名称";
             // 
@@ -135,62 +113,14 @@ namespace UAS_LabelMachine
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
             // 
-<<<<<<< HEAD
-            // 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(1517, 27);
-            this.CodeSoft.Margin = new System.Windows.Forms.Padding(4);
-            this.CodeSoft.Name = "CodeSoft";
-            this.CodeSoft.Size = new System.Drawing.Size(145, 35);
-            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(1352, 27);
-            this.Bartender.Margin = new System.Windows.Forms.Padding(4);
-            this.Bartender.Name = "Bartender";
-            this.Bartender.Size = new System.Drawing.Size(157, 35);
-            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(1234, 22);
-            this.labelSoft_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.labelSoft_label.Name = "labelSoft_label";
-            this.labelSoft_label.Size = new System.Drawing.Size(110, 31);
-            this.labelSoft_label.TabIndex = 163;
-            this.labelSoft_label.Text = "模板软件";
-            // 
-=======
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-<<<<<<< HEAD
-            this.label1.Location = new System.Drawing.Point(1317, 165);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(158, 31);
-=======
             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(132, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label1.TabIndex = 164;
             this.label1.Text = "模板参数预览";
             // 
@@ -198,33 +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)));
-<<<<<<< HEAD
-            this.PrinterList_lable.Location = new System.Drawing.Point(1234, 74);
-            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(134, 31);
-=======
             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(112, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrinterList_lable.TabIndex = 175;
             this.PrinterList_lable.Text = "打印机列表";
             // 
             // OpenFolder
             // 
-<<<<<<< HEAD
-            this.OpenFolder.Location = new System.Drawing.Point(847, 584);
-            this.OpenFolder.Margin = new System.Windows.Forms.Padding(4);
-            this.OpenFolder.Name = "OpenFolder";
-            this.OpenFolder.Size = new System.Drawing.Size(112, 40);
-=======
             this.OpenFolder.Location = new System.Drawing.Point(776, 612);
             this.OpenFolder.Margin = new System.Windows.Forms.Padding(4);
             this.OpenFolder.Name = "OpenFolder";
             this.OpenFolder.Size = new System.Drawing.Size(100, 34);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.OpenFolder.TabIndex = 156;
             this.OpenFolder.Text = "打开";
             this.OpenFolder.UseVisualStyleBackColor = true;
@@ -234,51 +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)));
-<<<<<<< HEAD
-            this.label3.Location = new System.Drawing.Point(454, 539);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.label3.TabIndex = 171;
             this.label3.Text = "盘标类型";
             // 
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-<<<<<<< HEAD
-            this.FolderPath.Location = new System.Drawing.Point(572, 592);
-            this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
-            this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(240, 28);
-=======
             this.FolderPath.Location = new System.Drawing.Point(531, 616);
             this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
             this.FolderPath.Name = "FolderPath";
             this.FolderPath.Size = new System.Drawing.Size(213, 25);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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)));
-<<<<<<< HEAD
-            this.FolderPath_Label.Location = new System.Drawing.Point(442, 589);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.FolderPath_Label.TabIndex = 158;
             this.FolderPath_Label.Text = "模板路径";
             // 
@@ -291,34 +186,20 @@ namespace UAS_LabelMachine
             "单盘",
             "中盒",
             "外箱"});
-<<<<<<< HEAD
-            this.la_type1.Location = new System.Drawing.Point(572, 545);
-            this.la_type1.Margin = new System.Windows.Forms.Padding(4);
-            this.la_type1.Name = "la_type1";
-            this.la_type1.Size = new System.Drawing.Size(240, 26);
-=======
             this.la_type1.Location = new System.Drawing.Point(531, 567);
             this.la_type1.Margin = new System.Windows.Forms.Padding(4);
             this.la_type1.Name = "la_type1";
             this.la_type1.Size = new System.Drawing.Size(213, 23);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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)));
-<<<<<<< HEAD
-            this.cl_custcode_label.Location = new System.Drawing.Point(37, 540);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_custcode_label.TabIndex = 167;
             this.cl_custcode_label.Text = "客户编号";
             // 
@@ -332,51 +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)));
-<<<<<<< HEAD
-            this.la_code_label.Location = new System.Drawing.Point(841, 540);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code_label.TabIndex = 178;
             this.la_code_label.Text = "模板编号";
             // 
             // LabelParam
             // 
             this.LabelParam.AutoScroll = true;
-<<<<<<< HEAD
-            this.LabelParam.Location = new System.Drawing.Point(1269, 200);
-            this.LabelParam.Margin = new System.Windows.Forms.Padding(4);
-            this.LabelParam.Name = "LabelParam";
-            this.LabelParam.Size = new System.Drawing.Size(428, 318);
-=======
             this.LabelParam.Location = new System.Drawing.Point(1230, 147);
             this.LabelParam.Margin = new System.Windows.Forms.Padding(4);
             this.LabelParam.Name = "LabelParam";
             this.LabelParam.Size = new System.Drawing.Size(328, 400);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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)));
-<<<<<<< HEAD
-            this.NetURL_label.Location = new System.Drawing.Point(1234, 113);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NetURL_label.TabIndex = 181;
             this.NetURL_label.Text = "网络路径";
             // 
@@ -384,17 +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)));
-<<<<<<< HEAD
-            this.cl_labeltype_label.Location = new System.Drawing.Point(860, 24);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cl_labeltype_label.TabIndex = 185;
             this.cl_labeltype_label.Text = "盘标类型";
             // 
@@ -403,52 +256,31 @@ namespace UAS_LabelMachine
             this.la_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.la_type.DropDownWidth = 161;
             this.la_type.FormattingEnabled = true;
-<<<<<<< HEAD
-            this.la_type.Location = new System.Drawing.Point(980, 24);
-            this.la_type.Margin = new System.Windows.Forms.Padding(4);
-            this.la_type.Name = "la_type";
-            this.la_type.Size = new System.Drawing.Size(240, 26);
-=======
             this.la_type.Location = new System.Drawing.Point(940, 20);
             this.la_type.Margin = new System.Windows.Forms.Padding(4);
             this.la_type.Name = "la_type";
             this.la_type.Size = new System.Drawing.Size(213, 23);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_type.TabIndex = 184;
             this.la_type.Tag = "cl_labeltype";
             // 
             // la_name
             // 
-            this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-<<<<<<< HEAD
-            this.la_name.Location = new System.Drawing.Point(164, 585);
-            this.la_name.Margin = new System.Windows.Forms.Padding(4);
-            this.la_name.Name = "la_name";
-            this.la_name.Size = new System.Drawing.Size(221, 28);
-=======
             this.la_name.Location = new System.Drawing.Point(155, 616);
             this.la_name.Margin = new System.Windows.Forms.Padding(4);
             this.la_name.Name = "la_name";
             this.la_name.Size = new System.Drawing.Size(0, 25);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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)));
-<<<<<<< HEAD
-            this.la_name_label.Location = new System.Drawing.Point(37, 585);
-            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(110, 31);
-=======
             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(92, 27);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_name_label.TabIndex = 187;
             this.la_name_label.Text = "模板名称";
             // 
@@ -457,23 +289,14 @@ namespace UAS_LabelMachine
             this.FTPShare.AutoSize = true;
             this.FTPShare.Checked = true;
             this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
-<<<<<<< HEAD
-            this.FTPShare.Location = new System.Drawing.Point(1002, 594);
-            this.FTPShare.Margin = new System.Windows.Forms.Padding(4);
-            this.FTPShare.Name = "FTPShare";
-            this.FTPShare.Size = new System.Drawing.Size(97, 22);
-=======
             this.FTPShare.Location = new System.Drawing.Point(905, 621);
             this.FTPShare.Margin = new System.Windows.Forms.Padding(4);
             this.FTPShare.Name = "FTPShare";
             this.FTPShare.Size = new System.Drawing.Size(83, 19);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.FTPShare.TabIndex = 188;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
             // 
-<<<<<<< HEAD
-=======
             // CodeSoft
             // 
             this.CodeSoft.AutoSize = true;
@@ -489,38 +312,23 @@ namespace UAS_LabelMachine
             this.CodeSoft.UseVisualStyleBackColor = true;
             this.CodeSoft.Visible = false;
             // 
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             // pagination1
             // 
             this.pagination1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
-<<<<<<< HEAD
-            this.pagination1.Location = new System.Drawing.Point(0, 667);
-            this.pagination1.Margin = new System.Windows.Forms.Padding(6);
-            this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1733, 39);
-=======
             this.pagination1.Location = new System.Drawing.Point(0, 683);
             this.pagination1.Margin = new System.Windows.Forms.Padding(5);
             this.pagination1.Name = "pagination1";
             this.pagination1.Size = new System.Drawing.Size(1572, 39);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.pagination1.TabIndex = 190;
             // 
             // NewLabel
             // 
             this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
-<<<<<<< HEAD
-            this.NewLabel.Location = new System.Drawing.Point(1269, 573);
-            this.NewLabel.Margin = new System.Windows.Forms.Padding(4);
-            this.NewLabel.Name = "NewLabel";
-            this.NewLabel.Size = new System.Drawing.Size(112, 44);
-=======
             this.NewLabel.Location = new System.Drawing.Point(1128, 613);
             this.NewLabel.Margin = new System.Windows.Forms.Padding(4);
             this.NewLabel.Name = "NewLabel";
             this.NewLabel.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NewLabel.TabIndex = 189;
             this.NewLabel.Tag = "IfWrite";
             this.NewLabel.Text = "新增标签";
@@ -530,17 +338,10 @@ namespace UAS_LabelMachine
             // NetURL
             // 
             this.NetURL.ID = null;
-<<<<<<< HEAD
-            this.NetURL.Location = new System.Drawing.Point(1393, 116);
-            this.NetURL.Margin = new System.Windows.Forms.Padding(4);
-            this.NetURL.Name = "NetURL";
-            this.NetURL.Size = new System.Drawing.Size(282, 28);
-=======
             this.NetURL.Location = new System.Drawing.Point(1368, 61);
             this.NetURL.Margin = new System.Windows.Forms.Padding(4);
             this.NetURL.Name = "NetURL";
             this.NetURL.Size = new System.Drawing.Size(161, 25);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.NetURL.Str = null;
             this.NetURL.Str1 = null;
             this.NetURL.Str2 = null;
@@ -553,20 +354,12 @@ namespace UAS_LabelMachine
             this.la_code.Caller = null;
             this.la_code.Condition = null;
             this.la_code.FormName = null;
-<<<<<<< HEAD
-            this.la_code.Location = new System.Drawing.Point(977, 544);
-=======
             this.la_code.Location = new System.Drawing.Point(905, 569);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code.Margin = new System.Windows.Forms.Padding(4);
             this.la_code.Name = "la_code";
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
-<<<<<<< HEAD
-            this.la_code.Size = new System.Drawing.Size(242, 32);
-=======
             this.la_code.Size = new System.Drawing.Size(215, 26);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
@@ -574,17 +367,10 @@ namespace UAS_LabelMachine
             // Save
             // 
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
-<<<<<<< HEAD
-            this.Save.Location = new System.Drawing.Point(1107, 584);
-            this.Save.Margin = new System.Windows.Forms.Padding(4);
-            this.Save.Name = "Save";
-            this.Save.Size = new System.Drawing.Size(112, 44);
-=======
             this.Save.Location = new System.Drawing.Point(1020, 613);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.Name = "Save";
             this.Save.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Save.TabIndex = 170;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -593,34 +379,20 @@ namespace UAS_LabelMachine
             // 
             // ChooseAll
             // 
-<<<<<<< HEAD
-            this.ChooseAll.Location = new System.Drawing.Point(26, 146);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
-            this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(76, 34);
-=======
             this.ChooseAll.Location = new System.Drawing.Point(23, 112);
             this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(45, 26);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.ChooseAll.TabIndex = 177;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // PrinterList
             // 
-<<<<<<< HEAD
-            this.PrinterList.Location = new System.Drawing.Point(1393, 74);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(284, 30);
-=======
             this.PrinterList.Location = new System.Drawing.Point(1368, 27);
             this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(161, 25);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrinterList.TabIndex = 174;
             // 
             // LabelDataGridView
@@ -642,24 +414,6 @@ namespace UAS_LabelMachine
             this.cl_detno,
             this.cl_labelsoft,
             this.cl_status});
-<<<<<<< HEAD
-            this.LabelDataGridView.Location = new System.Drawing.Point(26, 123);
-            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4);
-            this.LabelDataGridView.Name = "LabelDataGridView";
-            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(1193, 395);
-=======
             this.LabelDataGridView.Location = new System.Drawing.Point(23, 112);
             this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(4);
             this.LabelDataGridView.Name = "LabelDataGridView";
@@ -676,7 +430,6 @@ namespace UAS_LabelMachine
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.LabelDataGridView.Size = new System.Drawing.Size(1186, 435);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             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);
@@ -771,17 +524,10 @@ namespace UAS_LabelMachine
             // PrintTest
             // 
             this.PrintTest.Image = ((System.Drawing.Image)(resources.GetObject("PrintTest.Image")));
-<<<<<<< HEAD
-            this.PrintTest.Location = new System.Drawing.Point(1397, 573);
-            this.PrintTest.Margin = new System.Windows.Forms.Padding(4);
-            this.PrintTest.Name = "PrintTest";
-            this.PrintTest.Size = new System.Drawing.Size(112, 44);
-=======
             this.PrintTest.Location = new System.Drawing.Point(1354, 569);
             this.PrintTest.Margin = new System.Windows.Forms.Padding(4);
             this.PrintTest.Name = "PrintTest";
             this.PrintTest.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.PrintTest.TabIndex = 166;
             this.PrintTest.Tag = "Print";
             this.PrintTest.Text = "打印测试";
@@ -793,20 +539,12 @@ namespace UAS_LabelMachine
             this.客户编号.Caller = null;
             this.客户编号.Condition = null;
             this.客户编号.FormName = null;
-<<<<<<< HEAD
-            this.客户编号.Location = new System.Drawing.Point(164, 539);
-=======
             this.客户编号.Location = new System.Drawing.Point(155, 566);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.客户编号.Margin = new System.Windows.Forms.Padding(4);
             this.客户编号.Name = "客户编号";
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
-<<<<<<< HEAD
-            this.客户编号.Size = new System.Drawing.Size(242, 32);
-=======
             this.客户编号.Size = new System.Drawing.Size(181, 26);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
@@ -816,20 +554,12 @@ namespace UAS_LabelMachine
             this.cu_code.Caller = null;
             this.cu_code.Condition = null;
             this.cu_code.FormName = null;
-<<<<<<< HEAD
-            this.cu_code.Location = new System.Drawing.Point(190, 24);
-=======
             this.cu_code.Location = new System.Drawing.Point(169, 20);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_code.Margin = new System.Windows.Forms.Padding(4);
             this.cu_code.Name = "cu_code";
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
-<<<<<<< HEAD
-            this.cu_code.Size = new System.Drawing.Size(225, 32);
-=======
             this.cu_code.Size = new System.Drawing.Size(200, 26);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
@@ -837,17 +567,10 @@ namespace UAS_LabelMachine
             // UpdateGrid
             // 
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
-<<<<<<< HEAD
-            this.UpdateGrid.Location = new System.Drawing.Point(1044, 71);
-            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4);
-            this.UpdateGrid.Name = "UpdateGrid";
-            this.UpdateGrid.Size = new System.Drawing.Size(112, 44);
-=======
             this.UpdateGrid.Location = new System.Drawing.Point(927, 61);
             this.UpdateGrid.Margin = new System.Windows.Forms.Padding(4);
             this.UpdateGrid.Name = "UpdateGrid";
             this.UpdateGrid.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.UpdateGrid.TabIndex = 154;
             this.UpdateGrid.Tag = "IfWrite";
             this.UpdateGrid.Text = "更新";
@@ -857,17 +580,10 @@ namespace UAS_LabelMachine
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
-<<<<<<< HEAD
-            this.Screen.Location = new System.Drawing.Point(866, 71);
-            this.Screen.Margin = new System.Windows.Forms.Padding(4);
-            this.Screen.Name = "Screen";
-            this.Screen.Size = new System.Drawing.Size(112, 44);
-=======
             this.Screen.Location = new System.Drawing.Point(776, 61);
             this.Screen.Margin = new System.Windows.Forms.Padding(4);
             this.Screen.Name = "Screen";
             this.Screen.Size = new System.Drawing.Size(81, 30);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Screen.TabIndex = 153;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "筛选";
@@ -877,17 +593,10 @@ namespace UAS_LabelMachine
             // cu_name
             // 
             this.cu_name.ID = null;
-<<<<<<< HEAD
-            this.cu_name.Location = new System.Drawing.Point(628, 24);
-            this.cu_name.Margin = new System.Windows.Forms.Padding(4);
-            this.cu_name.Name = "cu_name";
-            this.cu_name.Size = new System.Drawing.Size(223, 28);
-=======
             this.cu_name.Location = new System.Drawing.Point(559, 20);
             this.cu_name.Margin = new System.Windows.Forms.Padding(4);
             this.cu_name.Name = "cu_name";
             this.cu_name.Size = new System.Drawing.Size(199, 25);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.cu_name.Str = null;
             this.cu_name.Str1 = null;
             this.cu_name.Str2 = null;
@@ -896,15 +605,9 @@ namespace UAS_LabelMachine
             // 
             // 客户标签维护
             // 
-<<<<<<< HEAD
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1732, 706);
-=======
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1572, 726);
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Controls.Add(this.pagination1);
             this.Controls.Add(this.NewLabel);
             this.Controls.Add(this.FTPShare);
@@ -938,10 +641,6 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cu_name);
             this.Controls.Add(this.cl_code_label);
             this.Controls.Add(this.cu_name_label);
-<<<<<<< HEAD
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-=======
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";
@@ -956,7 +655,7 @@ namespace UAS_LabelMachine
         }
 
         #endregion
-    
+
         private CustomControl.EnterTextBox cu_name;
         private Label cl_code_label;
         private Label cu_name_label;
@@ -980,14 +679,14 @@ namespace UAS_LabelMachine
         private CustomControl.DataGridViewWithSerialNum LabelDataGridView;
         private PrinterCombox PrinterList;
         private Label PrinterList_lable;
-    
+
         private ChooseAllButton ChooseAll;
         private Label la_code_label;
         private SearchTextBox la_code;
         private Panel LabelParam;
         private EnterTextBox NetURL;
         private Label NetURL_label;
-      
+
         private Label cl_labeltype_label;
         private ComboBox la_type;
         private TextBox la_name;

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

@@ -223,10 +223,7 @@
         48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
 </value>
   </data>
-<<<<<<< HEAD
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>78</value>
   </metadata>
-=======
->>>>>>> 45a8a889b36b36e16643a2d33d74fc41ee4073a5
 </root>