修改怡海能达特殊解析规则和生成条码的限制

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

@@ -10,25 +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">
-        <value>ftp://richwellgroup.com.cn#printuser#printuser</value>
-      </setting>
-    </UAS_LabelMachine.Properties.Settings>
-  </userSettings>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
@@ -55,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-出货标签管理/Login.cs

@@ -22,9 +22,7 @@ namespace UAS_LabelMachine
         {
             //拦截双击标题栏、移动窗体的系统消息  
             if (m.Msg != 0xA3)
-            {
                 base.WndProc(ref m);
-            }
         }
 
         private void Login_Load(object sender, EventArgs e)
@@ -48,10 +46,10 @@ namespace UAS_LabelMachine
             {
                 Directory.CreateDirectory("Log"); //新建文件夹   
             }
-            string sysdisc = Environment.GetEnvironmentVariable("windir").Substring(0,1);
-            if (!Directory.Exists(sysdisc+@":\打印标签"))
+            string sysdisc = Environment.GetEnvironmentVariable("windir").Substring(0, 1);
+            if (!Directory.Exists(sysdisc + @":\打印标签"))
                 Directory.CreateDirectory(sysdisc + @":\打印标签");
-            FileStream fs = new FileStream("Log/"+DateTime.Now.ToString("yyyy-MM-dd") +".txt", FileMode.OpenOrCreate, FileAccess.ReadWrite);
+            FileStream fs = new FileStream("Log/" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", FileMode.OpenOrCreate, FileAccess.ReadWrite);
         }
 
         private void LoginIcon_Click(object sender, EventArgs e)
@@ -72,8 +70,8 @@ namespace UAS_LabelMachine
             dh = new DataHelper();
             if (dh.CheckExist("employee", "em_code='" + UserName.Text + "' and em_password='" + PassWord.Text + "'"))
             {
-                dt =(DataTable)dh.ExecuteSql("select em_name,em_type from employee where em_code='"+UserName.Text+"'","select");
-                User.UserName = dt.Rows[0]["em_name"].ToString() ;
+                dt = (DataTable)dh.ExecuteSql("select em_name,em_type from employee where em_code='" + UserName.Text + "'", "select");
+                User.UserName = dt.Rows[0]["em_name"].ToString();
                 User.UserCode = UserName.Text;
                 User.UserAccountType = dt.Rows[0]["em_type"].ToString();
                 //保存此次登陆的用户名和密码
@@ -126,9 +124,8 @@ namespace UAS_LabelMachine
 
         private void IP_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter) {
-                DataHelper.DBConnectionString = "Data Source="+IP.Text+"/orcl;User ID=DATACENTER;PassWord=select!#%*(";
-            }
+            if (e.KeyCode == Keys.Enter)
+                DataHelper.DBConnectionString = "Data Source=" + IP.Text + "/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         }
     }
 }

UAS-出货标签管理/Program.cs

@@ -60,12 +60,14 @@ namespace UAS_LabelMachine
 
         static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
         {
+            Console.WriteLine("出现啊");
             string str = GetExceptionMsg(e.Exception, e.ToString());
             MessageBox.Show(str, "操作异常", MessageBoxButtons.OK, MessageBoxIcon.Stop);
         }
         //未处理的异常统一通过这里返回
         static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
+            Console.WriteLine("异常");
             string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
             MessageBox.Show(str, "操作异常", MessageBoxButtons.OK, MessageBoxIcon.Stop);
         }
@@ -82,7 +84,7 @@ namespace UAS_LabelMachine
             if (ex != null)
             {
                 sb.AppendLine(ex.Message);
-                //sb.AppendLine(ex.StackTrace);
+                sb.AppendLine(ex.StackTrace);
                 //sb.AppendLine("【异常方法】：" + ex.TargetSite);
             }
             LogManager.DoLog(sb.ToString());

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

@@ -2,20 +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">
-      <Value Profile="(Default)">ftp://richwellgroup.com.cn#printuser#printuser</Value>
+    <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,24 +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()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://richwellgroup.com.cn#printuser#printuser")]
-        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-出货标签管理/PublicMethod/AutoSizeFormClass.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using UAS_LabelMachine.CustomControl;
-using UAS_LabelMachine.CustomControl.GroupBoxWithBorder;
 
 namespace UAS_LabelMachine.PublicMethod
 {
@@ -30,6 +29,7 @@ namespace UAS_LabelMachine.PublicMethod
             AddControl(mForm);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
                               //this.WindowState = (FormWindowState)(2);//记录完控件的初始位置和大小后，再最大化
                               //0 - Normalize , 1 - Minimize,2- Maximize
+
         }
 
         private void AddControl(Control ctl)
@@ -44,6 +44,7 @@ namespace UAS_LabelMachine.PublicMethod
                 //**放在这里，是先记录控件本身，后记录控件的子控件
                 if (c.Controls.Count > 0)
                     AddControl(c);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
+                System.Console.WriteLine("初始位置：" + objCtrl.Left + "," + objCtrl.Top + "," + objCtrl.Width + "," + objCtrl.Height);
             }
         }
         //(3.2)控件自适应大小,
@@ -63,6 +64,7 @@ namespace UAS_LabelMachine.PublicMethod
             float hScale = (float)mForm.Height / (float)oldCtrl[0].Height;//.Height;
             ctrlNo = 1;//进入=1，第0个为窗体本身,窗体内的控件,从序号1开始
             AutoScaleControl(mForm, wScale, hScale);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
+
         }
 
         private void AutoScaleControl(Control ctl, float wScale, float hScale)
@@ -70,20 +72,21 @@ namespace UAS_LabelMachine.PublicMethod
             int ctrLeft0, ctrTop0, ctrWidth0, ctrHeight0;
             //int ctrlNo = 1;//第1个是窗体自身的 Left,Top,Width,Height，所以窗体控件从ctrlNo=1开始
             foreach (Control c in ctl.Controls)
-            { //**放在这里，是先缩放控件的子控件，后缩放控件本身
-              //if (c.Controls.Count > 0)
-              //   AutoScaleControl(c, wScale, hScale);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
+            {
+                //**放在这里，是先缩放控件的子控件，后缩放控件本身
+                //if (c.Controls.Count > 0)
+                //AutoScaleControl(c, wScale, hScale);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
                 ctrLeft0 = oldCtrl[ctrlNo].Left;
                 ctrTop0 = oldCtrl[ctrlNo].Top;
                 ctrWidth0 = oldCtrl[ctrlNo].Width;
                 ctrHeight0 = oldCtrl[ctrlNo].Height;
                 //c.Left = (int)((ctrLeft0 - wLeft0) * wScale) + wLeft1;//新旧控件之间的线性比例
                 //c.Top = (int)((ctrTop0 - wTop0) * h) + wTop1;
-         
+
                 c.Left = (int)((ctrLeft0) * wScale);//新旧控件之间的线性比例。控件位置只相对于窗体，所以不能加 + wLeft1
                 c.Top = (int)((ctrTop0) * hScale);//
                 //设置指定的类型不进行宽高的变化
-                if (!(c is Button || c is HeadBar))
+                if (!(c is Button || c is HeadBar||c is Pagination))
                 {
                     c.Width = (int)(ctrWidth0 * wScale);//只与最初的大小相关，所以不能与现在的宽度相乘 (int)(c.Width * w);
                     c.Height = (int)(ctrHeight0 * hScale);//
@@ -91,24 +94,27 @@ namespace UAS_LabelMachine.PublicMethod
                 ctrlNo++;//累加序号
                 //**放在这里，是先缩放控件本身，后缩放控件的子控件
                 if (c.Controls.Count > 0)
+                {
                     AutoScaleControl(c, wScale, hScale);//窗体内其余控件还可能嵌套控件(比如panel),要单独抽出,因为要递归调用
-
-                if (ctl is DataGridView)
+                    System.Console.WriteLine(c.GetType());
+                    System.Console.WriteLine("修改之后：" + c.Left + "," + c.Top + "," + c.Width + "," + c.Height);
+                }
+            }
+            if (ctl is DataGridView)
+            {
+                DataGridView dgv = ctl as DataGridView;
+                Cursor.Current = Cursors.WaitCursor;
+                int widths = 0;
+                for (int i = 0; i < dgv.Columns.Count; i++)
                 {
-                    DataGridView dgv = ctl as DataGridView;
-                    Cursor.Current = Cursors.WaitCursor;
-                    int widths = 0;
-                    for (int i = 0; i < dgv.Columns.Count; i++)
-                    {
-                        dgv.AutoResizeColumn(i, DataGridViewAutoSizeColumnMode.AllCells);  // 自动调整列宽  
-                        widths += dgv.Columns[i].Width;   // 计算调整列后单元列的宽度和                       
-                    }
-                    if (widths >= ctl.Size.Width)  // 如果调整列的宽度大于设定列宽  
-                        dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells;  // 调整列的模式 自动  
-                    else
-                        dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;  // 如果小于 则填充  
-                    Cursor.Current = Cursors.Default;
+                    dgv.AutoResizeColumn(i, DataGridViewAutoSizeColumnMode.AllCells);  // 自动调整列宽  
+                    widths += dgv.Columns[i].Width;   // 计算调整列后单元列的宽度和                       
                 }
+                if (widths >= ctl.Size.Width)  // 如果调整列的宽度大于设定列宽  
+                    dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells;  // 调整列的模式 自动  
+                else
+                    dgv.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;  // 如果小于 则填充  
+                Cursor.Current = Cursors.Default;
             }
         }
     }

UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -75,7 +75,6 @@ namespace UAS_LabelMachine
         public object GetLabelParam(string sql)
         {
             DataTable dt = new DataTable();
-            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
@@ -533,7 +532,7 @@ namespace UAS_LabelMachine
             //添加参数的具体内容
             for (int i = 0; i < ColumnCount; i++)
             {
-               string[] par = new string[RowCount];
+                string[] par = new string[RowCount];
                 for (int j = 0; j < RowCount; j++)
                 {
                     par[j] = dt.Rows[j][i].ToString();
@@ -769,7 +768,6 @@ namespace UAS_LabelMachine
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
                 }
             }
-            Console.WriteLine(SQL);
             switch (Type.ToUpper())
             {
                 case "SELECT":
@@ -879,12 +877,8 @@ namespace UAS_LabelMachine
             command.ArrayBindCount = names[1].Length;
             //因为第一个数组保存的是参数的名称，所以循环从1而不是0开始
             //将第一个数组的下标固定为0作为循环添加的参数的名称
-            Console.WriteLine(names.Length);
-            Console.WriteLine(names[0][0]);
-            Console.WriteLine(names[1][0]);
             for (int i = 1; i <= names[0].Length; i++)
             {
-                Console.WriteLine(i+"  "+names[0].Length);
                 command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
             command.ExecuteNonQuery();

UAS-出货标签管理/PublicMethod/ftpOperater.cs

@@ -9,7 +9,7 @@ namespace UAS_LabelMachine
 {
     class ftpOperater
     {
-        public static string FTPAddress = Properties.Settings.Default.FTPAddress.Split('#')[0];
+        public static string FTPAddress = Properties.Settings.Default.FTPAddress.Split('|')[0];
 
         public static  string DownLoadTo = Environment.GetEnvironmentVariable("windir").Substring(0, 1) + @":\" + @"打印标签\";
 
@@ -19,7 +19,7 @@ namespace UAS_LabelMachine
 
         public ftpOperater()
         {
-           string[] FTPInf = Properties.Settings.Default.FTPAddress.Split('#');
+           string[] FTPInf = Properties.Settings.Default.FTPAddress.Split('|');
             this.ftpServerIP = FTPInf[0];
             this.ftpUser = FTPInf[1];
             this.ftpPwd = FTPInf[2];

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,10 +45,6 @@
     <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -208,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" />
@@ -319,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_出货标签管理.resx

@@ -141,6 +141,9 @@
   <metadata name="RefreshDBConnect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="MidSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
   <metadata name="pib_cusbarcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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();
@@ -58,6 +55,10 @@ namespace UAS_LabelMachine
             this.la_type = new System.Windows.Forms.ComboBox();
             this.la_name = new System.Windows.Forms.TextBox();
             this.la_name_label = new System.Windows.Forms.Label();
+            this.FTPShare = new System.Windows.Forms.CheckBox();
+            this.CodeSoft = new System.Windows.Forms.RadioButton();
+            this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
+            this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
             this.NetURL = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.la_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.Save = new UAS_LabelMachine.CustomControl.NormalButton();
@@ -83,9 +84,6 @@ namespace UAS_LabelMachine
             this.UpdateGrid = new UAS_LabelMachine.CustomControl.NormalButton();
             this.Screen = new UAS_LabelMachine.CustomControl.NormalButton();
             this.cu_name = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.FTPShare = new System.Windows.Forms.CheckBox();
-            this.NewLabel = new UAS_LabelMachine.CustomControl.NormalButton();
-            this.pagination1 = new UAS_LabelMachine.CustomControl.Pagination();
             ((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);
             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);
             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);
             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);
             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,37 +256,92 @@ 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);
             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";
             // 
             // 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)));
-            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);
             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 = "模板名称";
             // 
+            // FTPShare
+            // 
+            this.FTPShare.AutoSize = true;
+            this.FTPShare.Checked = true;
+            this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
+            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);
+            this.FTPShare.TabIndex = 188;
+            this.FTPShare.Text = "FTP共享";
+            this.FTPShare.UseVisualStyleBackColor = true;
+            // 
+            // 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;
+            // 
+            // pagination1
+            // 
+            this.pagination1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+            this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
+            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);
+            this.pagination1.TabIndex = 190;
+            // 
+            // NewLabel
+            // 
+            this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
+            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);
+            this.NewLabel.TabIndex = 189;
+            this.NewLabel.Tag = "IfWrite";
+            this.NewLabel.Text = "新增标签";
+            this.NewLabel.UseVisualStyleBackColor = true;
+            this.NewLabel.Click += new System.EventHandler(this.NewLabel_Click);
+            // 
             // 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);
             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 +354,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);
             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 +367,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);
             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 +379,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);
             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);
             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 +414,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);
             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;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.Blue;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.LabelDataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.White;
+            this.LabelDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle6;
             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 +524,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);
             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 +539,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);
             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 +554,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);
             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 +567,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);
             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 +580,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);
             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,53 +593,21 @@ 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);
             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;
             this.cu_name.TabIndex = 147;
             this.cu_name.Tag = "cu_name";
             // 
-            // FTPShare
-            // 
-            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.Name = "FTPShare";
-            this.FTPShare.Size = new System.Drawing.Size(66, 16);
-            this.FTPShare.TabIndex = 188;
-            this.FTPShare.Text = "FTP共享";
-            this.FTPShare.UseVisualStyleBackColor = true;
-            // 
-            // NewLabel
-            // 
-            this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
-            this.NewLabel.Location = new System.Drawing.Point(846, 546);
-            this.NewLabel.Name = "NewLabel";
-            this.NewLabel.Size = new System.Drawing.Size(75, 29);
-            this.NewLabel.TabIndex = 189;
-            this.NewLabel.Tag = "IfWrite";
-            this.NewLabel.Text = "新增标签";
-            this.NewLabel.UseVisualStyleBackColor = true;
-            this.NewLabel.Click += new System.EventHandler(this.NewLabel_Click);
-            // 
-            // pagination1
-            // 
-            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.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1338, 32);
-            this.pagination1.TabIndex = 190;
-            // 
             // 客户标签维护
             // 
-            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, 726);
             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);
@@ -633,7 +641,7 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cu_name);
             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);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";
             this.Text = "客户标签维护";
@@ -647,7 +655,7 @@ namespace UAS_LabelMachine
         }
 
         #endregion
-    
+
         private CustomControl.EnterTextBox cu_name;
         private Label cl_code_label;
         private Label cu_name_label;
@@ -661,9 +669,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 客户编号;
@@ -674,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;
@@ -702,5 +707,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();
@@ -86,23 +87,24 @@ namespace UAS_LabelMachine
             la_code.SelectField = "la_code # 模板编号,la_name # 模板名称";
             NetURL.Text = Settings.Default.ShareUrl;
         }
-
+        
         private void 条码维护_Load(object sender, EventArgs e)
         {
             if (Settings.Default.FTPAddress == "")
             {
                 FTPShare.Visible = false;
             }
-            asc.controllInitializeSize(this);
             dh = new DataHelper();
             condition.Append("");
 
-
             ChooseAll.ChooseAll(LabelDataGridView);
             BaseUtil.SetComboxData(la_type, "display", "value", labeltype);
             //加载下拉框的静态值
             LoadData();
+            Width = Width + 1;
+            asc.controllInitializeSize(this);
             lbl = new ApplicationClass();
+            Width = Width + 1;
         }
 
         private void LabelDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
@@ -172,15 +174,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 == "编辑")
             {
@@ -198,7 +191,7 @@ namespace UAS_LabelMachine
                     FolderPath.Text = ftpOperater.DownLoadTo;
                 }
             }
-            asc.controllInitializeSize(this);
+            //asc.controllInitializeSize(this);
         }
 
         private void Screen_Click(object sender, EventArgs e)
@@ -228,10 +221,6 @@ namespace UAS_LabelMachine
             {
                 LabelSoft = "CodeSoft";
             }
-            if (Bartender.Checked)
-            {
-                LabelSoft = "Bartender";
-            }
             DataTable dt = (DataTable)LabelDataGridView.DataSource;
             //如果有改变的行才传递到后台
             if (dt.GetChanges() != null)
@@ -264,11 +253,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 +373,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 +382,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 +398,8 @@ namespace UAS_LabelMachine
                     dh.ExecuteSql(sql.ToString(), "insert");
                     sql.Clear();
                 }
-                else {
+                else
+                {
                     //目标路径
                     string targetPath = NetURL.Text;
                     //var file = Directory.GetFiles(targetPath);
@@ -435,7 +423,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 + "')");

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

@@ -124,6 +124,18 @@
     <value>173, 22</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="NewLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
+        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
+        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
+        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
+        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
+        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
+        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
+</value>
+  </data>
   <data name="Save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
@@ -211,16 +223,7 @@
         48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
 </value>
   </data>
-  <data name="NewLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhUgAXAIQAAK/G1qjB1dzn6bTK2MfZ46rE1arD1/D4+/n//d/o7/X6/ez1/K7D1tLj6+Pt9ubx
-        877S3fT09DxZeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAUgAXAAAI/wAlCBxIsKDBgwgTKlzIsGCEhxAjSpxIsaLFixgzPhQY
-        AYHHjyBDihxJsqTJkygjcFTAsqXLlzBjypxJs6ZNlRIiHNjJs6fPn0CDCh1KtCjOCAuSKl3KtKnTp1Cj
-        Sp169IHVq1izat3KtavXr2Crgh1LtqzZrUcdqF3Ltq3bt3Djyp1L92iCu3jz6t3Lt6/fv4ADHxVAuLDh
-        w4gTK17MuLHjow0iS55MubLly5gza958lIHnz6BDix5NurTp06iPGljNurXr17Bjy55Nu/bRALhz697N
-        u7fv38CDCz9aoLjx48iTK1/OvLnz50cBSJ9Ovbr169iza9/O/eiA7+DDi0EfT768+fPo0x+FwL69+/fw
-        48ufT7++/fX28+vfzz/+UQIABijggAQWaOCBCCao4FEaNejggxBG1NCEFFZoIUIBAQA7
-</value>
-  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>78</value>
+  </metadata>
 </root>

UAS-出货标签管理/生成条码.Designer.cs

@@ -41,6 +41,7 @@
             this.GenerateBarCode = new UAS_LabelMachine.CustomControl.NormalButton();
             this.Screen = new UAS_LabelMachine.CustomControl.NormalButton();
             this.ProdIoInfDGV = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -57,7 +58,6 @@
             this.mid_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mid_num = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mid_remain = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.ProdIoInfDGV)).BeginInit();
             this.SuspendLayout();
             // 
@@ -207,12 +207,25 @@
             this.ProdIoInfDGV.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.ProdIoInfDGV_CellEndEdit);
             this.ProdIoInfDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.ProdIoInfDGV_CellPainting);
             // 
+            // pi_inoutno
+            // 
+            this.pi_inoutno.ID = null;
+            this.pi_inoutno.Location = new System.Drawing.Point(128, 29);
+            this.pi_inoutno.Name = "pi_inoutno";
+            this.pi_inoutno.Size = new System.Drawing.Size(121, 21);
+            this.pi_inoutno.Str = null;
+            this.pi_inoutno.Str1 = null;
+            this.pi_inoutno.Str2 = null;
+            this.pi_inoutno.TabIndex = 149;
+            this.pi_inoutno.Tag = "cu_name";
+            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bi_inoutno_KeyDown);
+            // 
             // Choose
             // 
             this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.Choose.HeaderText = "勾选";
             this.Choose.Name = "Choose";
-            this.Choose.Width = 70;
+            this.Choose.Width = 60;
             // 
             // pd_pdno
             // 
@@ -317,19 +330,6 @@
             this.mid_remain.Name = "mid_remain";
             this.mid_remain.ReadOnly = true;
             // 
-            // pi_inoutno
-            // 
-            this.pi_inoutno.ID = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(128, 29);
-            this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(121, 21);
-            this.pi_inoutno.Str = null;
-            this.pi_inoutno.Str1 = null;
-            this.pi_inoutno.Str2 = null;
-            this.pi_inoutno.TabIndex = 149;
-            this.pi_inoutno.Tag = "cu_name";
-            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bi_inoutno_KeyDown);
-            // 
             // 生成条码
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

UAS-出货标签管理/生成条码.cs

@@ -122,26 +122,26 @@ namespace UAS_LabelMachine
                     //中盒尾数
                     int mid_remain = int.Parse(ProdIoInfDGV.Rows[i].Cells["mid_remain"].FormattedValue.ToString());
                     //本次数量不能大于总数
-                    if (pd_qty > pd_totalqty)
-                    {
-                        if (!NotPass.ContainsKey(pd_pdno + pd_prodcode))
-                        {
-                            NotPass.Add(pd_pdno + pd_prodcode, pd_prodcode + "本次数量不能大于总数");
-                        }
-                        CheckedRowCount--;
-                        continue;
-                    }
-                    //后台查询已生成数量,本次数量不能大于已生成数量
-                    int qty = int.Parse(dh.getFieldDataByCondition("PRODIOBARCODE left join prodiodetail on  pib_pdid=pd_id and pib_prodcode=pd_prodcode", "nvl(sum(nvl(pib_qty,0)),0)", "  PIB_PIID='" + pi_id + "' and pd_pdno='" + pd_pdno + "' and pib_pdid=pd_id and pib_prodcode=pd_prodcode and pd_prodcode='" + pd_prodcode + "'").ToString());
-                    if (pd_qty > pd_totalqty - qty || pd_qty == 0)
-                    {
-                        if (!NotPass.ContainsKey(pd_pdno + pd_prodcode))
-                        {
-                            NotPass.Add(pd_pdno + pd_prodcode, "行号" + pd_pdno + ",物料号" + pd_prodcode + "已生成数量" + qty + ",剩余可以用数量" + (pd_totalqty - qty));
-                        }
-                        CheckedRowCount--;
-                        continue;
-                    }
+                    //if (pd_qty > pd_totalqty)
+                    //{
+                    //    if (!NotPass.ContainsKey(pd_pdno + pd_prodcode))
+                    //    {
+                    //        NotPass.Add(pd_pdno + pd_prodcode, pd_prodcode + "本次数量不能大于总数");
+                    //    }
+                    //    CheckedRowCount--;
+                    //    continue;
+                    //}
+                    ////后台查询已生成数量,本次数量不能大于已生成数量
+                    //int qty = int.Parse(dh.getFieldDataByCondition("PRODIOBARCODE left join prodiodetail on  pib_pdid=pd_id and pib_prodcode=pd_prodcode", "nvl(sum(nvl(pib_qty,0)),0)", "  PIB_PIID='" + pi_id + "' and pd_pdno='" + pd_pdno + "' and pib_pdid=pd_id and pib_prodcode=pd_prodcode and pd_prodcode='" + pd_prodcode + "'").ToString());
+                    //if (pd_qty > pd_totalqty - qty || pd_qty == 0)
+                    //{
+                    //    if (!NotPass.ContainsKey(pd_pdno + pd_prodcode))
+                    //    {
+                    //        NotPass.Add(pd_pdno + pd_prodcode, "行号" + pd_pdno + ",物料号" + pd_prodcode + "已生成数量" + qty + ",剩余可以用数量" + (pd_totalqty - qty));
+                    //    }
+                    //    CheckedRowCount--;
+                    //    continue;
+                    //}
                     string pib_barcode = dh.getFieldDataByCondition("prodiobarcode", "max(pib_barcode)", "pib_pdid=" + pd_id).ToString();
                     //中盒数量*中盒容量=需要打印的单盘标签
                     ArrayList<string> midcode = new ArrayList<string>();

UAS-出货标签管理/采集策略.cs

@@ -210,12 +210,9 @@ namespace UAS_LabelMachine
                                 Console.WriteLine(dt.Rows[i]["si_item"].ToString());
                                 //如果状态不为0则表示启用
                                 if (dt.Rows[i]["si_enable"].ToString() != "0")
-                                {
                                     (Controls["si_type" + j] as CheckBox).CheckState = CheckState.Checked;
-                                }
-                                else {
+                                else
                                     (Controls["si_type" + j] as CheckBox).CheckState = CheckState.Unchecked;
-                                }
                                 Controls["si_id" + j].Text = dt.Rows[i]["si_id"].ToString();
                                 Controls["si_detno" + j].Text = dt.Rows[i]["si_detno"].ToString();
                                 Controls["si_kind" + j].Text = dt.Rows[i]["si_kind"].ToString();
@@ -229,9 +226,8 @@ namespace UAS_LabelMachine
                         }
                     }
                 }
-                else {
+                else
                     MessageBox.Show("不存在编号为" + sg_code.Text + "的采集策略");
-                }
             }
         }
 
@@ -244,9 +240,7 @@ namespace UAS_LabelMachine
         {
             BaseUtil.CleanForm(this);
             for (int i = 1; i < 5; i++)
-            {
                 (Controls["si_type" + i] as CheckBox).Checked = false;
-            }
         }
     }
 }