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

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

@@ -61,7 +61,7 @@ namespace UAS_LabelMachine
             BindTable = tablename;
             SelectField = selectfield.Replace("#", "as");
             //返回一个带有结构的空的DataTable
-            dt = (DataTable)dh.ExecuteSql("select " + SelectField + " from " + tablename, "select");
+            dt = (DataTable)dh.ExecuteSql("select " + SelectField + " from " + tablename +" where rownum<20", "select");
             //设置DataTable的描述和列名，为了字段赋值
             selectfield = selectfield.Replace(",", "#");
             string[] NameAndCapation = selectfield.Split('#');

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

@@ -114,7 +114,7 @@
             this.label3.AutoSize = true;
             this.label3.BackColor = System.Drawing.Color.Transparent;
             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(324, 209);
+            this.label3.Location = new System.Drawing.Point(321, 209);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(42, 21);
             this.label3.TabIndex = 6;
@@ -135,7 +135,7 @@
             this.Master.AutoSize = true;
             this.Master.BackColor = System.Drawing.Color.Transparent;
             this.Master.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Master.Location = new System.Drawing.Point(324, 250);
+            this.Master.Location = new System.Drawing.Point(321, 250);
             this.Master.Name = "Master";
             this.Master.Size = new System.Drawing.Size(42, 21);
             this.Master.TabIndex = 8;
@@ -146,7 +146,7 @@
             this.label4.AutoSize = true;
             this.label4.BackColor = System.Drawing.Color.Transparent;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(324, 288);
+            this.label4.Location = new System.Drawing.Point(321, 288);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(25, 21);
             this.label4.TabIndex = 10;

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

@@ -3,7 +3,6 @@ using System.Data;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
 using UAS_LabelMachine.Entity;
 using UAS_LabelMachine.PublicMethod;
@@ -74,7 +73,7 @@ namespace UAS_LabelMachine
                     Ms_Pwd = dt.Rows[i]["ms_pwd"].ToString();
             }
             //切换至用户选择的数据源
-            string ConnectionString = "Connection Timeout=0;Pooling=false;Password=" + Ms_Pwd + ";User ID=" + MasterCombox.SelectedValue.ToString() + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + IP.Text + ")(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            string ConnectionString = "Connection Timeout=0;Pooling=false;Password=" + Ms_Pwd + ";User ID=" + MasterCombox.SelectedValue.ToString() + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + IP.Text + ")(PORT=" + DataHelper.OraclePort + ")))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             DataHelper.DBConnectionString = ConnectionString;
             //设置了Connection，重新执行构造函数，重置数据库连接
             dh = new DataHelper();
@@ -91,7 +90,7 @@ namespace UAS_LabelMachine
                 Properties.Settings.Default.IPAddress = IP.Text;
                 Properties.Settings.Default.Save();
                 //弹出标签打印的主界面
-                UAS_出货标签打印 main = new UAS_出货标签打印();
+                UAS_出货标签打印 main = new UAS_出货标签打印(MasterCombox.Text);
                 main.StartPosition = FormStartPosition.CenterScreen;
                 Hide();
                 main.ShowDialog();

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

@@ -13,8 +13,12 @@ namespace UAS_LabelMachine
 
         //富为外网地址
         //private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
+        //富为ERP地址
+        //public static readonly string ERPAddesss = "http://richwellgroup.com.cn:8099/ERP/";
         //富为FTP
         //public static readonly string FTPAdress = "ftp://richwellgroup.com.cn|printuser|printuser";
+        //Oracle端口
+        //public static readonly string OraclePort = "1521";
 
         //怡海能达外网地址
         //private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
@@ -22,6 +26,8 @@ namespace UAS_LabelMachine
         //public static readonly string ERPAddesss = "http://sz.hi-mantech.com:8099/ERP/";
         //怡海能达FTP
         //public static readonly string FTPAdress = "ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8";
+        //Oracle端口
+        //public static readonly string OraclePort = "1521";
 
         //华商龙外网地址
         private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YITOA_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.18.115.198)(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -29,6 +35,8 @@ namespace UAS_LabelMachine
         public static readonly string ERPAddesss = "http://218.18.115.198:8888/ERP/";
         //华商龙FTP
         public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
+        //Oracle端口
+        public static readonly string OraclePort = "1523";
 
         //用户选择的数据库的连接字符串
         public static string DBConnectionString;

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

@@ -1,6 +1,4 @@
 using System;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -10,7 +8,7 @@ namespace UAS_LabelMachine
 {
     class ftpOperater
     {
-        public static string FTPAddress = Properties.Settings.Default.FTPAddress.Split('|')[0];
+        public static string FTPAddress = DataHelper.FTPAdress.Split('|')[0];
 
         public static string DownLoadTo = Environment.GetEnvironmentVariable("windir").Substring(0, 1) + @":\" + @"打印标签\";
 

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

@@ -119,6 +119,27 @@
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_cusoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ViVoPlate = new System.Windows.Forms.Button();
@@ -152,27 +173,6 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_vendprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_cusoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -763,7 +763,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(69, 150);
+            this.label18.Location = new System.Drawing.Point(68, 149);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -797,7 +797,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(68, 76);
+            this.label16.Location = new System.Drawing.Point(67, 75);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -831,7 +831,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(13, 114);
+            this.label12.Location = new System.Drawing.Point(12, 113);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
             this.label12.TabIndex = 77;
@@ -841,7 +841,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(13, 40);
+            this.label7.Location = new System.Drawing.Point(12, 39);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 76;
@@ -889,7 +889,7 @@
             // 
             this.Capacity.AutoSize = true;
             this.Capacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Capacity.Location = new System.Drawing.Point(61, 67);
+            this.Capacity.Location = new System.Drawing.Point(60, 66);
             this.Capacity.Name = "Capacity";
             this.Capacity.Size = new System.Drawing.Size(0, 17);
             this.Capacity.TabIndex = 75;
@@ -898,7 +898,7 @@
             // 
             this.Process_midboxcode.AutoSize = true;
             this.Process_midboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_midboxcode.Location = new System.Drawing.Point(61, 111);
+            this.Process_midboxcode.Location = new System.Drawing.Point(60, 110);
             this.Process_midboxcode.Name = "Process_midboxcode";
             this.Process_midboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_midboxcode.TabIndex = 74;
@@ -908,7 +908,7 @@
             // 
             this.Process_outboxcode.AutoSize = true;
             this.Process_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_outboxcode.Location = new System.Drawing.Point(61, 87);
+            this.Process_outboxcode.Location = new System.Drawing.Point(60, 86);
             this.Process_outboxcode.Name = "Process_outboxcode";
             this.Process_outboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_outboxcode.TabIndex = 73;
@@ -919,7 +919,7 @@
             this.TotalCount.AutoSize = true;
             this.TotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.TotalCount.ForeColor = System.Drawing.Color.Blue;
-            this.TotalCount.Location = new System.Drawing.Point(95, 19);
+            this.TotalCount.Location = new System.Drawing.Point(94, 18);
             this.TotalCount.Name = "TotalCount";
             this.TotalCount.Size = new System.Drawing.Size(15, 17);
             this.TotalCount.TabIndex = 72;
@@ -929,7 +929,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(82, 19);
+            this.label17.Location = new System.Drawing.Point(81, 18);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(13, 17);
             this.label17.TabIndex = 71;
@@ -940,7 +940,7 @@
             this.CollectedCount.AutoSize = true;
             this.CollectedCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CollectedCount.ForeColor = System.Drawing.Color.Red;
-            this.CollectedCount.Location = new System.Drawing.Point(64, 19);
+            this.CollectedCount.Location = new System.Drawing.Point(63, 18);
             this.CollectedCount.Name = "CollectedCount";
             this.CollectedCount.Size = new System.Drawing.Size(15, 17);
             this.CollectedCount.TabIndex = 70;
@@ -950,7 +950,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(11, 88);
+            this.label14.Location = new System.Drawing.Point(10, 87);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(32, 17);
             this.label14.TabIndex = 69;
@@ -960,7 +960,7 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(11, 111);
+            this.label11.Location = new System.Drawing.Point(10, 110);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(32, 17);
             this.label11.TabIndex = 68;
@@ -970,7 +970,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(11, 47);
+            this.label13.Location = new System.Drawing.Point(10, 46);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(44, 17);
             this.label13.TabIndex = 67;
@@ -980,7 +980,7 @@
             // 
             this.Installed.AutoSize = true;
             this.Installed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Installed.Location = new System.Drawing.Point(61, 47);
+            this.Installed.Location = new System.Drawing.Point(60, 46);
             this.Installed.Name = "Installed";
             this.Installed.Size = new System.Drawing.Size(0, 17);
             this.Installed.TabIndex = 66;
@@ -989,7 +989,7 @@
             // 
             this.Process.AutoSize = true;
             this.Process.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process.Location = new System.Drawing.Point(11, 19);
+            this.Process.Location = new System.Drawing.Point(10, 18);
             this.Process.Name = "Process";
             this.Process.Size = new System.Drawing.Size(44, 17);
             this.Process.TabIndex = 65;
@@ -1098,6 +1098,169 @@
             this.LabelInf.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelInf_CellValueChanged);
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.Name = "Choose";
+            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 55;
+            // 
+            // pib_ifpick
+            // 
+            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifpick.DataPropertyName = "pib_ifpick";
+            this.pib_ifpick.HeaderText = "已采集";
+            this.pib_ifpick.Name = "pib_ifpick";
+            this.pib_ifpick.Width = 60;
+            // 
+            // pib_ifprint
+            // 
+            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifprint.DataPropertyName = "pib_ifprint";
+            this.pib_ifprint.HeaderText = "已打印";
+            this.pib_ifprint.Name = "pib_ifprint";
+            this.pib_ifprint.Width = 60;
+            // 
+            // pib_id1
+            // 
+            this.pib_id1.DataPropertyName = "pib_id";
+            this.pib_id1.HeaderText = "pib_id";
+            this.pib_id1.Name = "pib_id1";
+            this.pib_id1.Visible = false;
+            this.pib_id1.Width = 66;
+            // 
+            // pib_pdno
+            // 
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_pdno.DataPropertyName = "pib_pdno";
+            this.pib_pdno.HeaderText = "明细序号";
+            this.pib_pdno.Name = "pib_pdno";
+            this.pib_pdno.ReadOnly = true;
+            this.pib_pdno.Width = 96;
+            // 
+            // pib_prodcode
+            // 
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 78;
+            // 
+            // pr_vendprodcode
+            // 
+            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
+            this.pr_vendprodcode.HeaderText = "MPN";
+            this.pr_vendprodcode.Name = "pr_vendprodcode";
+            this.pr_vendprodcode.ReadOnly = true;
+            this.pr_vendprodcode.Width = 48;
+            // 
+            // pr_brand
+            // 
+            this.pr_brand.DataPropertyName = "pr_brand";
+            this.pr_brand.HeaderText = "品牌";
+            this.pr_brand.Name = "pr_brand";
+            this.pr_brand.Width = 54;
+            // 
+            // pib_madein
+            // 
+            this.pib_madein.DataPropertyName = "pib_madein";
+            this.pib_madein.HeaderText = "产地";
+            this.pib_madein.Name = "pib_madein";
+            this.pib_madein.Visible = false;
+            this.pib_madein.Width = 54;
+            // 
+            // pib_lotno
+            // 
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.Width = 60;
+            // 
+            // pib_datecode
+            // 
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.Width = 78;
+            // 
+            // pib_cusbarcode
+            // 
+            this.pib_cusbarcode.DataPropertyName = "pib_cusbarcode";
+            this.pib_cusbarcode.HeaderText = "ViVo条码号";
+            this.pib_cusbarcode.Name = "pib_cusbarcode";
+            this.pib_cusbarcode.Width = 90;
+            // 
+            // pib_cusoutboxcode
+            // 
+            this.pib_cusoutboxcode.DataPropertyName = "pib_cusoutboxcode";
+            this.pib_cusoutboxcode.HeaderText = "ViVo外箱";
+            this.pib_cusoutboxcode.Name = "pib_cusoutboxcode";
+            this.pib_cusoutboxcode.Width = 78;
+            // 
+            // pib_datecode1
+            // 
+            this.pib_datecode1.DataPropertyName = "pib_datecode1";
+            this.pib_datecode1.HeaderText = "DateCode1";
+            this.pib_datecode1.Name = "pib_datecode1";
+            this.pib_datecode1.Visible = false;
+            this.pib_datecode1.Width = 84;
+            // 
+            // pib_qty
+            // 
+            this.pib_qty.DataPropertyName = "pib_qty";
+            this.pib_qty.HeaderText = "数量";
+            this.pib_qty.Name = "pib_qty";
+            this.pib_qty.ReadOnly = true;
+            this.pib_qty.Width = 54;
+            // 
+            // pib_barcode
+            // 
+            this.pib_barcode.DataPropertyName = "pib_barcode";
+            this.pib_barcode.HeaderText = "唯一条码";
+            this.pib_barcode.Name = "pib_barcode";
+            this.pib_barcode.ReadOnly = true;
+            this.pib_barcode.Width = 78;
+            // 
+            // pd_pocode
+            // 
+            this.pd_pocode.DataPropertyName = "pd_pocode";
+            this.pd_pocode.HeaderText = "客户PO";
+            this.pd_pocode.Name = "pd_pocode";
+            this.pd_pocode.ReadOnly = true;
+            this.pd_pocode.Width = 66;
+            // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "客户料号";
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.Width = 78;
+            // 
+            // pd_custprodspec
+            // 
+            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
+            this.pd_custprodspec.HeaderText = "客户型号";
+            this.pd_custprodspec.Name = "pd_custprodspec";
+            this.pd_custprodspec.Width = 78;
+            // 
+            // pib_outboxcode1
+            // 
+            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
+            this.pib_outboxcode1.HeaderText = "中盒号";
+            this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.Width = 90;
+            // 
+            // pib_outboxcode2
+            // 
+            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
+            this.pib_outboxcode2.HeaderText = "外箱号";
+            this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.Width = 90;
+            // 
             // pi_inoutno
             // 
             this.pi_inoutno.ID = null;
@@ -1132,7 +1295,7 @@
             // 
             this.ViVoPlate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ViVoPlate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ViVoPlate.Location = new System.Drawing.Point(80, 163);
+            this.ViVoPlate.Location = new System.Drawing.Point(37, 162);
             this.ViVoPlate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ViVoPlate.Name = "ViVoPlate";
             this.ViVoPlate.Size = new System.Drawing.Size(68, 26);
@@ -1154,7 +1317,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 200);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 202);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1167,7 +1330,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(9, 110);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(8, 109);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1225,7 +1388,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(7, 167);
+            this.label5.Location = new System.Drawing.Point(6, 166);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(32, 17);
             this.label5.TabIndex = 50;
@@ -1235,7 +1398,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(7, 138);
+            this.label4.Location = new System.Drawing.Point(6, 137);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(32, 17);
             this.label4.TabIndex = 49;
@@ -1254,7 +1417,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(94, 137);
+            this.label15.Location = new System.Drawing.Point(93, 136);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(20, 17);
             this.label15.TabIndex = 40;
@@ -1285,7 +1448,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(10, 108);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(9, 107);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1335,7 +1498,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(114, 16);
+            this.LogingOut.Location = new System.Drawing.Point(113, 15);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -1372,7 +1535,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(8, 182);
+            this.label10.Location = new System.Drawing.Point(7, 181);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -1395,7 +1558,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(88, 212);
+            this.label9.Location = new System.Drawing.Point(87, 211);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(32, 17);
             this.label9.TabIndex = 88;
@@ -1418,7 +1581,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(8, 212);
+            this.label8.Location = new System.Drawing.Point(7, 211);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(32, 17);
             this.label8.TabIndex = 83;
@@ -1428,7 +1591,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(8, 151);
+            this.label6.Location = new System.Drawing.Point(7, 150);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -1485,7 +1648,7 @@
             // 
             this.OutBoxLabelAutoPrint.AutoSize = true;
             this.OutBoxLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLabelAutoPrint.Location = new System.Drawing.Point(11, 112);
+            this.OutBoxLabelAutoPrint.Location = new System.Drawing.Point(10, 111);
             this.OutBoxLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxLabelAutoPrint.Name = "OutBoxLabelAutoPrint";
             this.OutBoxLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1505,169 +1668,6 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "勾选";
-            this.Choose.Name = "Choose";
-            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 55;
-            // 
-            // pib_ifpick
-            // 
-            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifpick.DataPropertyName = "pib_ifpick";
-            this.pib_ifpick.HeaderText = "已采集";
-            this.pib_ifpick.Name = "pib_ifpick";
-            this.pib_ifpick.Width = 60;
-            // 
-            // pib_ifprint
-            // 
-            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifprint.DataPropertyName = "pib_ifprint";
-            this.pib_ifprint.HeaderText = "已打印";
-            this.pib_ifprint.Name = "pib_ifprint";
-            this.pib_ifprint.Width = 60;
-            // 
-            // pib_id1
-            // 
-            this.pib_id1.DataPropertyName = "pib_id";
-            this.pib_id1.HeaderText = "pib_id";
-            this.pib_id1.Name = "pib_id1";
-            this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
-            // 
-            // pib_pdno
-            // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_pdno.DataPropertyName = "pib_pdno";
-            this.pib_pdno.HeaderText = "明细序号";
-            this.pib_pdno.Name = "pib_pdno";
-            this.pib_pdno.ReadOnly = true;
-            this.pib_pdno.Width = 96;
-            // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 78;
-            // 
-            // pr_vendprodcode
-            // 
-            this.pr_vendprodcode.DataPropertyName = "pr_vendprodcode";
-            this.pr_vendprodcode.HeaderText = "MPN";
-            this.pr_vendprodcode.Name = "pr_vendprodcode";
-            this.pr_vendprodcode.ReadOnly = true;
-            this.pr_vendprodcode.Width = 48;
-            // 
-            // pr_brand
-            // 
-            this.pr_brand.DataPropertyName = "pr_brand";
-            this.pr_brand.HeaderText = "品牌";
-            this.pr_brand.Name = "pr_brand";
-            this.pr_brand.Width = 54;
-            // 
-            // pib_madein
-            // 
-            this.pib_madein.DataPropertyName = "pib_madein";
-            this.pib_madein.HeaderText = "产地";
-            this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Visible = false;
-            this.pib_madein.Width = 54;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.Width = 60;
-            // 
-            // pib_datecode
-            // 
-            this.pib_datecode.DataPropertyName = "pib_datecode";
-            this.pib_datecode.HeaderText = "DateCode";
-            this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 78;
-            // 
-            // pib_cusbarcode
-            // 
-            this.pib_cusbarcode.DataPropertyName = "pib_cusbarcode";
-            this.pib_cusbarcode.HeaderText = "ViVo条码号";
-            this.pib_cusbarcode.Name = "pib_cusbarcode";
-            this.pib_cusbarcode.Width = 90;
-            // 
-            // pib_cusoutboxcode
-            // 
-            this.pib_cusoutboxcode.DataPropertyName = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.HeaderText = "ViVo外箱";
-            this.pib_cusoutboxcode.Name = "pib_cusoutboxcode";
-            this.pib_cusoutboxcode.Width = 78;
-            // 
-            // pib_datecode1
-            // 
-            this.pib_datecode1.DataPropertyName = "pib_datecode1";
-            this.pib_datecode1.HeaderText = "DateCode1";
-            this.pib_datecode1.Name = "pib_datecode1";
-            this.pib_datecode1.Visible = false;
-            this.pib_datecode1.Width = 84;
-            // 
-            // pib_qty
-            // 
-            this.pib_qty.DataPropertyName = "pib_qty";
-            this.pib_qty.HeaderText = "数量";
-            this.pib_qty.Name = "pib_qty";
-            this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 54;
-            // 
-            // pib_barcode
-            // 
-            this.pib_barcode.DataPropertyName = "pib_barcode";
-            this.pib_barcode.HeaderText = "唯一条码";
-            this.pib_barcode.Name = "pib_barcode";
-            this.pib_barcode.ReadOnly = true;
-            this.pib_barcode.Width = 78;
-            // 
-            // pd_pocode
-            // 
-            this.pd_pocode.DataPropertyName = "pd_pocode";
-            this.pd_pocode.HeaderText = "客户PO";
-            this.pd_pocode.Name = "pd_pocode";
-            this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 66;
-            // 
-            // pd_custprodcode
-            // 
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "客户料号";
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.Width = 78;
-            // 
-            // pd_custprodspec
-            // 
-            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
-            this.pd_custprodspec.HeaderText = "客户型号";
-            this.pd_custprodspec.Name = "pd_custprodspec";
-            this.pd_custprodspec.Width = 78;
-            // 
-            // pib_outboxcode1
-            // 
-            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
-            this.pib_outboxcode1.HeaderText = "中盒号";
-            this.pib_outboxcode1.Name = "pib_outboxcode1";
-            this.pib_outboxcode1.Width = 90;
-            // 
-            // pib_outboxcode2
-            // 
-            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
-            this.pib_outboxcode2.HeaderText = "外箱号";
-            this.pib_outboxcode2.Name = "pib_outboxcode2";
-            this.pib_outboxcode2.Width = 90;
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1718,25 +1718,26 @@
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "UAS_出货标签打印";
             this.Text = " UAS-出货标签管理";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.贴标机条码打印_FormClosing);
             this.Load += new System.EventHandler(this.贴标机条码打印_Load);
             this.SizeChanged += new System.EventHandler(this.贴标机条码打印_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.ResumeLayout(false);
             this.groupBoxWithBorder1.PerformLayout();
-            this.CollectionProcess.ResumeLayout(true);
+            this.CollectionProcess.ResumeLayout(false);
             this.CollectionProcess.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).EndInit();
-            this.SingleLabel.ResumeLayout(true);
+            this.SingleLabel.ResumeLayout(false);
             this.SingleLabel.PerformLayout();
-            this.MidLabel.ResumeLayout(true);
+            this.MidLabel.ResumeLayout(false);
             this.MidLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.MidBoxCapacity)).EndInit();
-            this.OutBoxLabel.ResumeLayout(true);
+            this.OutBoxLabel.ResumeLayout(false);
             this.OutBoxLabel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.OutboxCapacity)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

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

@@ -138,9 +138,10 @@ namespace UAS_LabelMachine
         /// </summary>
         bool ComBoxClickChangeLabelDoc = false;
 
-        public UAS_出货标签打印()
+        public UAS_出货标签打印(string Master)
         {
             InitializeComponent();
+            Text = Text + "-" + Master;
         }
 
         protected override void WndProc(ref Message m)
@@ -359,6 +360,11 @@ namespace UAS_LabelMachine
                     MessageBox.Show("采集的数据不能为空");
                     return;
                 }
+                if (Si_ItemDGV.Rows.Count == 0)
+                {
+                    MessageBox.Show("未维护采集策略");
+                    return;
+                }
                 CollectInputData();
             }
         }
@@ -484,6 +490,7 @@ namespace UAS_LabelMachine
                 if (CollectVeProdCodePass && CollectQTYPass)
                 {
                     //如果按盒号采集，所有的此盒的均更新为
+                    DataTable dt = (DataTable)MidSource.DataSource;
                     if (CollectionUnit.Text == "盒")
                     {
                         string la_id = SingleLabelCombox.SelectedValue.ToString().Split('#')[0];
@@ -493,8 +500,8 @@ namespace UAS_LabelMachine
                         {
                             if (LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString() == LabelInf.Rows[CurrentRowIndex].Cells["pib_outboxcode1"].Value.ToString())
                             {
-                                LabelInf.Rows[i].Cells["pib_lotno"].Value = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"].Value;
-                                LabelInf.Rows[i].Cells["pib_datecode"].Value = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"].Value;
+                                dt.Rows[i]["pib_lotno"] = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"].Value;
+                                dt.Rows[i]["pib_datecode"] = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"].Value;
                                 //将采集数据正确的Cell添加到键值对中
                                 if (PaintCell.ContainsKey(LabelInf.Rows[i].Cells["pr_vendprodcode"]))
                                 {
@@ -523,8 +530,8 @@ namespace UAS_LabelMachine
                     {
                         for (int i = 0; i < LabelInf.RowCount; i++)
                         {
-                            LabelInf.Rows[i].Cells["pib_lotno"].Value = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"].Value;
-                            LabelInf.Rows[i].Cells["pib_datecode"].Value = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"].Value;
+                            dt.Rows[i]["pib_lotno"] = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"].Value;
+                            dt.Rows[i]["pib_datecode"] = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"].Value;
                             CurrentRowIndex = i;
                             //将采集数据正确的Cell添加到键值对中
                             if (PaintCell.ContainsKey(LabelInf.Rows[i].Cells["pr_vendprodcode"]))
@@ -711,22 +718,26 @@ namespace UAS_LabelMachine
                 {
                     DataGridViewCell cell = null;
                     string Matchstr = "";
+                    string field = "";
                     switch (kind.ToString().ToUpper())
                     {
                         case "DATECODE":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_datecode"];
+                            field = "pib_datecode";
                             Matchstr = MatchStr(data[j], "DATECODE");
                             setdata.Remove("DATECODE");
                             length--;
                             break;
                         case "LOTNO":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_lotno"];
+                            field = "pib_lotno";
                             Matchstr = MatchStr(data[j], "LOTNO");
                             setdata.Remove("LOTNO");
                             length--;
                             break;
                         case "MPN":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pr_vendprodcode"];
+                            field = "pr_vendprodcode";
                             Matchstr = MatchStr(data[j], "MPN");
                             //采集的供应商号不匹配的话
                             if (cell.Value.ToString() != Matchstr)
@@ -752,6 +763,7 @@ namespace UAS_LabelMachine
                             break;
                         case "QTY":
                             cell = LabelInf.Rows[CurrentRowIndex].Cells["pib_qty"];
+                            field = "pib_qty";
                             Matchstr = MatchStr(data[j], "QTY");
                             //如果采集的数量不相等的话
                             if (cell.Value.ToString() != Matchstr)
@@ -785,7 +797,8 @@ namespace UAS_LabelMachine
                         string MatchResult = "";
                         if (kind != "MPN" && kind != "QTY")
                         {
-                            cell.Value = Matchstr;
+                            DataTable dt = (DataTable)MidSource.DataSource;
+                            dt.Rows[cell.RowIndex][field] = Matchstr;
                             MatchResult = "成功";
                         }
                         else

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

@@ -335,10 +335,8 @@ namespace UAS_LabelMachine
                     }
                 }
                 //保存参数打印
-                doc.Save();
                 doc.Printer.SwitchTo(PrinterList.Text);
                 doc.PrintDocument();
-                doc.Close();
             }
         }
 

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

@@ -185,6 +185,10 @@ namespace UAS_LabelMachine
                 LoadData();
                 MessageBox.Show("生成箱号成功！");
             }
+            else
+            {
+                MessageBox.Show("未勾选需要生成的明细!");
+            }
             //如果含有内容不符合的选项，进行提示
             string str = "";
             foreach (string ss in NotPass.Values)

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

@@ -112,10 +112,9 @@
             this.sg_name_label.AutoSize = true;
             this.sg_name_label.BackColor = System.Drawing.Color.Transparent;
             this.sg_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sg_name_label.Location = new System.Drawing.Point(399, 34);
-            this.sg_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sg_name_label.Location = new System.Drawing.Point(299, 27);
             this.sg_name_label.Name = "sg_name_label";
-            this.sg_name_label.Size = new System.Drawing.Size(92, 27);
+            this.sg_name_label.Size = new System.Drawing.Size(74, 21);
             this.sg_name_label.TabIndex = 7;
             this.sg_name_label.Text = "策略名称";
             // 
@@ -124,10 +123,9 @@
             this.sg_code_label.AutoSize = true;
             this.sg_code_label.BackColor = System.Drawing.Color.Transparent;
             this.sg_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sg_code_label.Location = new System.Drawing.Point(27, 34);
-            this.sg_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sg_code_label.Location = new System.Drawing.Point(20, 27);
             this.sg_code_label.Name = "sg_code_label";
-            this.sg_code_label.Size = new System.Drawing.Size(92, 27);
+            this.sg_code_label.Size = new System.Drawing.Size(74, 21);
             this.sg_code_label.TabIndex = 9;
             this.sg_code_label.Text = "策略编号";
             // 
@@ -135,10 +133,9 @@
             // 
             this.si_type2.AutoSize = true;
             this.si_type2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_type2.Location = new System.Drawing.Point(32, 253);
-            this.si_type2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_type2.Location = new System.Drawing.Point(24, 202);
             this.si_type2.Name = "si_type2";
-            this.si_type2.Size = new System.Drawing.Size(93, 31);
+            this.si_type2.Size = new System.Drawing.Size(76, 25);
             this.si_type2.TabIndex = 17;
             this.si_type2.Text = "LotNo";
             this.si_type2.UseVisualStyleBackColor = true;
@@ -147,10 +144,9 @@
             // 
             this.si_type1.AutoSize = true;
             this.si_type1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_type1.Location = new System.Drawing.Point(32, 383);
-            this.si_type1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_type1.Location = new System.Drawing.Point(24, 306);
             this.si_type1.Name = "si_type1";
-            this.si_type1.Size = new System.Drawing.Size(128, 31);
+            this.si_type1.Size = new System.Drawing.Size(105, 25);
             this.si_type1.TabIndex = 18;
             this.si_type1.Text = "DateCode";
             this.si_type1.UseVisualStyleBackColor = true;
@@ -159,10 +155,9 @@
             // 
             this.si_type4.AutoSize = true;
             this.si_type4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_type4.Location = new System.Drawing.Point(32, 133);
-            this.si_type4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_type4.Location = new System.Drawing.Point(24, 106);
             this.si_type4.Name = "si_type4";
-            this.si_type4.Size = new System.Drawing.Size(82, 31);
+            this.si_type4.Size = new System.Drawing.Size(68, 25);
             this.si_type4.TabIndex = 19;
             this.si_type4.Text = "MPN";
             this.si_type4.UseVisualStyleBackColor = true;
@@ -171,10 +166,9 @@
             // 
             this.si_type3.AutoSize = true;
             this.si_type3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_type3.Location = new System.Drawing.Point(32, 516);
-            this.si_type3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_type3.Location = new System.Drawing.Point(24, 413);
             this.si_type3.Name = "si_type3";
-            this.si_type3.Size = new System.Drawing.Size(73, 31);
+            this.si_type3.Size = new System.Drawing.Size(61, 25);
             this.si_type3.TabIndex = 20;
             this.si_type3.Text = "QTY";
             this.si_type3.UseVisualStyleBackColor = true;
@@ -184,10 +178,9 @@
             this.si_expression1_label.AutoSize = true;
             this.si_expression1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_expression1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_expression1_label.Location = new System.Drawing.Point(691, 423);
-            this.si_expression1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_expression1_label.Location = new System.Drawing.Point(518, 338);
             this.si_expression1_label.Name = "si_expression1_label";
-            this.si_expression1_label.Size = new System.Drawing.Size(112, 27);
+            this.si_expression1_label.Size = new System.Drawing.Size(90, 21);
             this.si_expression1_label.TabIndex = 25;
             this.si_expression1_label.Text = "正则表达式";
             // 
@@ -196,10 +189,9 @@
             this.si_kind1_label.AutoSize = true;
             this.si_kind1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_kind1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_kind1_label.Location = new System.Drawing.Point(357, 423);
-            this.si_kind1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_kind1_label.Location = new System.Drawing.Point(268, 338);
             this.si_kind1_label.Name = "si_kind1_label";
-            this.si_kind1_label.Size = new System.Drawing.Size(92, 27);
+            this.si_kind1_label.Size = new System.Drawing.Size(74, 21);
             this.si_kind1_label.TabIndex = 27;
             this.si_kind1_label.Text = "解析方式";
             // 
@@ -208,10 +200,9 @@
             this.si_detno1_label.AutoSize = true;
             this.si_detno1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_detno1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_detno1_label.Location = new System.Drawing.Point(27, 423);
-            this.si_detno1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_detno1_label.Location = new System.Drawing.Point(20, 338);
             this.si_detno1_label.Name = "si_detno1_label";
-            this.si_detno1_label.Size = new System.Drawing.Size(92, 27);
+            this.si_detno1_label.Size = new System.Drawing.Size(74, 21);
             this.si_detno1_label.TabIndex = 29;
             this.si_detno1_label.Text = "扫描次序";
             // 
@@ -220,10 +211,9 @@
             this.si_item1_label.AutoSize = true;
             this.si_item1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_item1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_item1_label.Location = new System.Drawing.Point(1113, 419);
-            this.si_item1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_item1_label.Location = new System.Drawing.Point(835, 335);
             this.si_item1_label.Name = "si_item1_label";
-            this.si_item1_label.Size = new System.Drawing.Size(92, 27);
+            this.si_item1_label.Size = new System.Drawing.Size(74, 21);
             this.si_item1_label.TabIndex = 31;
             this.si_item1_label.Text = "字段名称";
             this.si_item1_label.Visible = false;
@@ -233,10 +223,9 @@
             this.si_item2_label.AutoSize = true;
             this.si_item2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_item2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_item2_label.Location = new System.Drawing.Point(1113, 288);
-            this.si_item2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_item2_label.Location = new System.Drawing.Point(835, 230);
             this.si_item2_label.Name = "si_item2_label";
-            this.si_item2_label.Size = new System.Drawing.Size(92, 27);
+            this.si_item2_label.Size = new System.Drawing.Size(74, 21);
             this.si_item2_label.TabIndex = 41;
             this.si_item2_label.Text = "字段名称";
             this.si_item2_label.Visible = false;
@@ -246,10 +235,9 @@
             this.si_detno2_label.AutoSize = true;
             this.si_detno2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_detno2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_detno2_label.Location = new System.Drawing.Point(27, 292);
-            this.si_detno2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_detno2_label.Location = new System.Drawing.Point(20, 234);
             this.si_detno2_label.Name = "si_detno2_label";
-            this.si_detno2_label.Size = new System.Drawing.Size(92, 27);
+            this.si_detno2_label.Size = new System.Drawing.Size(74, 21);
             this.si_detno2_label.TabIndex = 39;
             this.si_detno2_label.Text = "扫描次序";
             // 
@@ -258,10 +246,9 @@
             this.si_kind2_label.AutoSize = true;
             this.si_kind2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_kind2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_kind2_label.Location = new System.Drawing.Point(357, 292);
-            this.si_kind2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_kind2_label.Location = new System.Drawing.Point(268, 234);
             this.si_kind2_label.Name = "si_kind2_label";
-            this.si_kind2_label.Size = new System.Drawing.Size(92, 27);
+            this.si_kind2_label.Size = new System.Drawing.Size(74, 21);
             this.si_kind2_label.TabIndex = 37;
             this.si_kind2_label.Text = "解析方式";
             // 
@@ -270,10 +257,9 @@
             this.si_expression2_label.AutoSize = true;
             this.si_expression2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_expression2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_expression2_label.Location = new System.Drawing.Point(691, 292);
-            this.si_expression2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_expression2_label.Location = new System.Drawing.Point(518, 234);
             this.si_expression2_label.Name = "si_expression2_label";
-            this.si_expression2_label.Size = new System.Drawing.Size(112, 27);
+            this.si_expression2_label.Size = new System.Drawing.Size(90, 21);
             this.si_expression2_label.TabIndex = 35;
             this.si_expression2_label.Text = "正则表达式";
             // 
@@ -282,10 +268,9 @@
             this.si_item3_label.AutoSize = true;
             this.si_item3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_item3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_item3_label.Location = new System.Drawing.Point(1113, 558);
-            this.si_item3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_item3_label.Location = new System.Drawing.Point(835, 446);
             this.si_item3_label.Name = "si_item3_label";
-            this.si_item3_label.Size = new System.Drawing.Size(92, 27);
+            this.si_item3_label.Size = new System.Drawing.Size(74, 21);
             this.si_item3_label.TabIndex = 51;
             this.si_item3_label.Text = "字段名称";
             this.si_item3_label.Visible = false;
@@ -295,10 +280,9 @@
             this.si_detno3_label.AutoSize = true;
             this.si_detno3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_detno3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_detno3_label.Location = new System.Drawing.Point(27, 562);
-            this.si_detno3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_detno3_label.Location = new System.Drawing.Point(20, 450);
             this.si_detno3_label.Name = "si_detno3_label";
-            this.si_detno3_label.Size = new System.Drawing.Size(92, 27);
+            this.si_detno3_label.Size = new System.Drawing.Size(74, 21);
             this.si_detno3_label.TabIndex = 49;
             this.si_detno3_label.Text = "扫描次序";
             // 
@@ -307,10 +291,9 @@
             this.si_kind3_label.AutoSize = true;
             this.si_kind3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_kind3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_kind3_label.Location = new System.Drawing.Point(357, 562);
-            this.si_kind3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_kind3_label.Location = new System.Drawing.Point(268, 450);
             this.si_kind3_label.Name = "si_kind3_label";
-            this.si_kind3_label.Size = new System.Drawing.Size(92, 27);
+            this.si_kind3_label.Size = new System.Drawing.Size(74, 21);
             this.si_kind3_label.TabIndex = 47;
             this.si_kind3_label.Text = "解析方式";
             // 
@@ -319,10 +302,9 @@
             this.si_expression3_label.AutoSize = true;
             this.si_expression3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_expression3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_expression3_label.Location = new System.Drawing.Point(691, 562);
-            this.si_expression3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_expression3_label.Location = new System.Drawing.Point(518, 450);
             this.si_expression3_label.Name = "si_expression3_label";
-            this.si_expression3_label.Size = new System.Drawing.Size(112, 27);
+            this.si_expression3_label.Size = new System.Drawing.Size(90, 21);
             this.si_expression3_label.TabIndex = 45;
             this.si_expression3_label.Text = "正则表达式";
             // 
@@ -331,10 +313,9 @@
             this.si_item4_label.AutoSize = true;
             this.si_item4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_item4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_item4_label.Location = new System.Drawing.Point(1113, 164);
-            this.si_item4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_item4_label.Location = new System.Drawing.Point(835, 131);
             this.si_item4_label.Name = "si_item4_label";
-            this.si_item4_label.Size = new System.Drawing.Size(92, 27);
+            this.si_item4_label.Size = new System.Drawing.Size(74, 21);
             this.si_item4_label.TabIndex = 61;
             this.si_item4_label.Text = "字段名称";
             this.si_item4_label.Visible = false;
@@ -344,10 +325,9 @@
             this.si_detno4_label.AutoSize = true;
             this.si_detno4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_detno4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_detno4_label.Location = new System.Drawing.Point(27, 168);
-            this.si_detno4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_detno4_label.Location = new System.Drawing.Point(20, 134);
             this.si_detno4_label.Name = "si_detno4_label";
-            this.si_detno4_label.Size = new System.Drawing.Size(92, 27);
+            this.si_detno4_label.Size = new System.Drawing.Size(74, 21);
             this.si_detno4_label.TabIndex = 59;
             this.si_detno4_label.Text = "扫描次序";
             // 
@@ -356,10 +336,9 @@
             this.si_kind4_label.AutoSize = true;
             this.si_kind4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_kind4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_kind4_label.Location = new System.Drawing.Point(357, 168);
-            this.si_kind4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_kind4_label.Location = new System.Drawing.Point(268, 134);
             this.si_kind4_label.Name = "si_kind4_label";
-            this.si_kind4_label.Size = new System.Drawing.Size(92, 27);
+            this.si_kind4_label.Size = new System.Drawing.Size(74, 21);
             this.si_kind4_label.TabIndex = 57;
             this.si_kind4_label.Text = "解析方式";
             // 
@@ -368,10 +347,9 @@
             this.si_expression4_label.AutoSize = true;
             this.si_expression4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_expression4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_expression4_label.Location = new System.Drawing.Point(691, 168);
-            this.si_expression4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_expression4_label.Location = new System.Drawing.Point(518, 134);
             this.si_expression4_label.Name = "si_expression4_label";
-            this.si_expression4_label.Size = new System.Drawing.Size(112, 27);
+            this.si_expression4_label.Size = new System.Drawing.Size(90, 21);
             this.si_expression4_label.TabIndex = 55;
             this.si_expression4_label.Text = "正则表达式";
             // 
@@ -385,10 +363,9 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind1.Location = new System.Drawing.Point(473, 424);
-            this.si_kind1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_kind1.Location = new System.Drawing.Point(355, 339);
             this.si_kind1.Name = "si_kind1";
-            this.si_kind1.Size = new System.Drawing.Size(208, 23);
+            this.si_kind1.Size = new System.Drawing.Size(157, 20);
             this.si_kind1.TabIndex = 10;
             // 
             // si_kind2
@@ -401,10 +378,9 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind2.Location = new System.Drawing.Point(473, 292);
-            this.si_kind2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_kind2.Location = new System.Drawing.Point(355, 234);
             this.si_kind2.Name = "si_kind2";
-            this.si_kind2.Size = new System.Drawing.Size(208, 23);
+            this.si_kind2.Size = new System.Drawing.Size(157, 20);
             this.si_kind2.TabIndex = 64;
             // 
             // si_kind3
@@ -417,10 +393,9 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind3.Location = new System.Drawing.Point(473, 562);
-            this.si_kind3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_kind3.Location = new System.Drawing.Point(355, 450);
             this.si_kind3.Name = "si_kind3";
-            this.si_kind3.Size = new System.Drawing.Size(208, 23);
+            this.si_kind3.Size = new System.Drawing.Size(157, 20);
             this.si_kind3.TabIndex = 65;
             // 
             // si_kind4
@@ -433,10 +408,9 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind4.Location = new System.Drawing.Point(473, 169);
-            this.si_kind4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_kind4.Location = new System.Drawing.Point(355, 135);
             this.si_kind4.Name = "si_kind4";
-            this.si_kind4.Size = new System.Drawing.Size(208, 23);
+            this.si_kind4.Size = new System.Drawing.Size(157, 20);
             this.si_kind4.TabIndex = 66;
             // 
             // si_index1_label
@@ -444,10 +418,9 @@
             this.si_index1_label.AutoSize = true;
             this.si_index1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_index1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_index1_label.Location = new System.Drawing.Point(27, 466);
-            this.si_index1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_index1_label.Location = new System.Drawing.Point(20, 373);
             this.si_index1_label.Name = "si_index1_label";
-            this.si_index1_label.Size = new System.Drawing.Size(92, 27);
+            this.si_index1_label.Size = new System.Drawing.Size(74, 21);
             this.si_index1_label.TabIndex = 67;
             this.si_index1_label.Text = "起始位置";
             // 
@@ -456,10 +429,9 @@
             this.si_length1_label.AutoSize = true;
             this.si_length1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_length1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_length1_label.Location = new System.Drawing.Point(691, 466);
-            this.si_length1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_length1_label.Location = new System.Drawing.Point(518, 373);
             this.si_length1_label.Name = "si_length1_label";
-            this.si_length1_label.Size = new System.Drawing.Size(52, 27);
+            this.si_length1_label.Size = new System.Drawing.Size(42, 21);
             this.si_length1_label.TabIndex = 69;
             this.si_length1_label.Text = "长度";
             // 
@@ -468,10 +440,9 @@
             this.si_indexstring1_label.AutoSize = true;
             this.si_indexstring1_label.BackColor = System.Drawing.Color.Transparent;
             this.si_indexstring1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_indexstring1_label.Location = new System.Drawing.Point(357, 466);
-            this.si_indexstring1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_indexstring1_label.Location = new System.Drawing.Point(268, 373);
             this.si_indexstring1_label.Name = "si_indexstring1_label";
-            this.si_indexstring1_label.Size = new System.Drawing.Size(92, 27);
+            this.si_indexstring1_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring1_label.TabIndex = 71;
             this.si_indexstring1_label.Text = "索引字符";
             // 
@@ -480,10 +451,9 @@
             this.si_indexstring2_label.AutoSize = true;
             this.si_indexstring2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_indexstring2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_indexstring2_label.Location = new System.Drawing.Point(357, 330);
-            this.si_indexstring2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_indexstring2_label.Location = new System.Drawing.Point(268, 264);
             this.si_indexstring2_label.Name = "si_indexstring2_label";
-            this.si_indexstring2_label.Size = new System.Drawing.Size(92, 27);
+            this.si_indexstring2_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring2_label.TabIndex = 77;
             this.si_indexstring2_label.Text = "索引字符";
             // 
@@ -492,10 +462,9 @@
             this.si_length2_label.AutoSize = true;
             this.si_length2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_length2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_length2_label.Location = new System.Drawing.Point(691, 330);
-            this.si_length2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_length2_label.Location = new System.Drawing.Point(518, 264);
             this.si_length2_label.Name = "si_length2_label";
-            this.si_length2_label.Size = new System.Drawing.Size(52, 27);
+            this.si_length2_label.Size = new System.Drawing.Size(42, 21);
             this.si_length2_label.TabIndex = 75;
             this.si_length2_label.Text = "长度";
             // 
@@ -504,10 +473,9 @@
             this.si_index2_label.AutoSize = true;
             this.si_index2_label.BackColor = System.Drawing.Color.Transparent;
             this.si_index2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_index2_label.Location = new System.Drawing.Point(27, 330);
-            this.si_index2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_index2_label.Location = new System.Drawing.Point(20, 264);
             this.si_index2_label.Name = "si_index2_label";
-            this.si_index2_label.Size = new System.Drawing.Size(92, 27);
+            this.si_index2_label.Size = new System.Drawing.Size(74, 21);
             this.si_index2_label.TabIndex = 73;
             this.si_index2_label.Text = "起始位置";
             // 
@@ -516,10 +484,9 @@
             this.si_indexstring3_label.AutoSize = true;
             this.si_indexstring3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_indexstring3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_indexstring3_label.Location = new System.Drawing.Point(357, 607);
-            this.si_indexstring3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_indexstring3_label.Location = new System.Drawing.Point(268, 486);
             this.si_indexstring3_label.Name = "si_indexstring3_label";
-            this.si_indexstring3_label.Size = new System.Drawing.Size(92, 27);
+            this.si_indexstring3_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring3_label.TabIndex = 83;
             this.si_indexstring3_label.Text = "索引字符";
             // 
@@ -528,10 +495,9 @@
             this.si_length3_label.AutoSize = true;
             this.si_length3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_length3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_length3_label.Location = new System.Drawing.Point(691, 607);
-            this.si_length3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_length3_label.Location = new System.Drawing.Point(518, 486);
             this.si_length3_label.Name = "si_length3_label";
-            this.si_length3_label.Size = new System.Drawing.Size(52, 27);
+            this.si_length3_label.Size = new System.Drawing.Size(42, 21);
             this.si_length3_label.TabIndex = 81;
             this.si_length3_label.Text = "长度";
             // 
@@ -540,10 +506,9 @@
             this.si_index3_label.AutoSize = true;
             this.si_index3_label.BackColor = System.Drawing.Color.Transparent;
             this.si_index3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_index3_label.Location = new System.Drawing.Point(27, 607);
-            this.si_index3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_index3_label.Location = new System.Drawing.Point(20, 486);
             this.si_index3_label.Name = "si_index3_label";
-            this.si_index3_label.Size = new System.Drawing.Size(92, 27);
+            this.si_index3_label.Size = new System.Drawing.Size(74, 21);
             this.si_index3_label.TabIndex = 79;
             this.si_index3_label.Text = "起始位置";
             // 
@@ -552,10 +517,9 @@
             this.si_indexstring4_label.AutoSize = true;
             this.si_indexstring4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_indexstring4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_indexstring4_label.Location = new System.Drawing.Point(357, 212);
-            this.si_indexstring4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_indexstring4_label.Location = new System.Drawing.Point(268, 170);
             this.si_indexstring4_label.Name = "si_indexstring4_label";
-            this.si_indexstring4_label.Size = new System.Drawing.Size(92, 27);
+            this.si_indexstring4_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring4_label.TabIndex = 89;
             this.si_indexstring4_label.Text = "索引字符";
             // 
@@ -564,10 +528,9 @@
             this.si_length4_label.AutoSize = true;
             this.si_length4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_length4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_length4_label.Location = new System.Drawing.Point(691, 212);
-            this.si_length4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_length4_label.Location = new System.Drawing.Point(518, 170);
             this.si_length4_label.Name = "si_length4_label";
-            this.si_length4_label.Size = new System.Drawing.Size(52, 27);
+            this.si_length4_label.Size = new System.Drawing.Size(42, 21);
             this.si_length4_label.TabIndex = 87;
             this.si_length4_label.Text = "长度";
             // 
@@ -576,10 +539,9 @@
             this.si_index4_label.AutoSize = true;
             this.si_index4_label.BackColor = System.Drawing.Color.Transparent;
             this.si_index4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_index4_label.Location = new System.Drawing.Point(27, 212);
-            this.si_index4_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.si_index4_label.Location = new System.Drawing.Point(20, 170);
             this.si_index4_label.Name = "si_index4_label";
-            this.si_index4_label.Size = new System.Drawing.Size(92, 27);
+            this.si_index4_label.Size = new System.Drawing.Size(74, 21);
             this.si_index4_label.TabIndex = 85;
             this.si_index4_label.Text = "起始位置";
             // 
@@ -588,10 +550,9 @@
             this.sg_separator_label.AutoSize = true;
             this.sg_separator_label.BackColor = System.Drawing.Color.Transparent;
             this.sg_separator_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sg_separator_label.Location = new System.Drawing.Point(1103, 34);
-            this.sg_separator_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sg_separator_label.Location = new System.Drawing.Point(827, 27);
             this.sg_separator_label.Name = "sg_separator_label";
-            this.sg_separator_label.Size = new System.Drawing.Size(72, 27);
+            this.sg_separator_label.Size = new System.Drawing.Size(58, 21);
             this.sg_separator_label.TabIndex = 91;
             this.sg_separator_label.Text = "分隔符";
             // 
@@ -600,10 +561,9 @@
             this.pb_name_label.AutoSize = true;
             this.pb_name_label.BackColor = System.Drawing.Color.Transparent;
             this.pb_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pb_name_label.Location = new System.Drawing.Point(777, 34);
-            this.pb_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pb_name_label.Location = new System.Drawing.Point(583, 27);
             this.pb_name_label.Name = "pb_name_label";
-            this.pb_name_label.Size = new System.Drawing.Size(52, 27);
+            this.pb_name_label.Size = new System.Drawing.Size(42, 21);
             this.pb_name_label.TabIndex = 101;
             this.pb_name_label.Text = "品牌";
             // 
@@ -612,10 +572,9 @@
             this.Add.BackColor = System.Drawing.Color.Transparent;
             this.Add.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Add.Image = ((System.Drawing.Image)(resources.GetObject("Add.Image")));
-            this.Add.Location = new System.Drawing.Point(841, 91);
-            this.Add.Margin = new System.Windows.Forms.Padding(4);
+            this.Add.Location = new System.Drawing.Point(631, 73);
             this.Add.Name = "Add";
-            this.Add.Size = new System.Drawing.Size(100, 36);
+            this.Add.Size = new System.Drawing.Size(75, 29);
             this.Add.TabIndex = 7;
             this.Add.Text = "新增";
             this.Add.UseVisualStyleBackColor = false;
@@ -625,10 +584,9 @@
             // 
             this.si_id1.Enabled = false;
             this.si_id1.ID = null;
-            this.si_id1.Location = new System.Drawing.Point(1219, 470);
-            this.si_id1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_id1.Location = new System.Drawing.Point(914, 376);
             this.si_id1.Name = "si_id1";
-            this.si_id1.Size = new System.Drawing.Size(208, 25);
+            this.si_id1.Size = new System.Drawing.Size(157, 21);
             this.si_id1.Str = null;
             this.si_id1.Str1 = null;
             this.si_id1.Str2 = null;
@@ -639,10 +597,9 @@
             // 
             this.si_id2.Enabled = false;
             this.si_id2.ID = null;
-            this.si_id2.Location = new System.Drawing.Point(1219, 336);
-            this.si_id2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_id2.Location = new System.Drawing.Point(914, 269);
             this.si_id2.Name = "si_id2";
-            this.si_id2.Size = new System.Drawing.Size(208, 25);
+            this.si_id2.Size = new System.Drawing.Size(157, 21);
             this.si_id2.Str = null;
             this.si_id2.Str1 = null;
             this.si_id2.Str2 = null;
@@ -653,10 +610,9 @@
             // 
             this.si_id3.Enabled = false;
             this.si_id3.ID = null;
-            this.si_id3.Location = new System.Drawing.Point(1219, 607);
-            this.si_id3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_id3.Location = new System.Drawing.Point(914, 486);
             this.si_id3.Name = "si_id3";
-            this.si_id3.Size = new System.Drawing.Size(208, 25);
+            this.si_id3.Size = new System.Drawing.Size(157, 21);
             this.si_id3.Str = null;
             this.si_id3.Str1 = null;
             this.si_id3.Str2 = null;
@@ -667,10 +623,9 @@
             // 
             this.si_id4.Enabled = false;
             this.si_id4.ID = null;
-            this.si_id4.Location = new System.Drawing.Point(1219, 217);
-            this.si_id4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_id4.Location = new System.Drawing.Point(914, 174);
             this.si_id4.Name = "si_id4";
-            this.si_id4.Size = new System.Drawing.Size(208, 25);
+            this.si_id4.Size = new System.Drawing.Size(157, 21);
             this.si_id4.Str = null;
             this.si_id4.Str1 = null;
             this.si_id4.Str2 = null;
@@ -680,10 +635,9 @@
             // sg_id
             // 
             this.sg_id.ID = null;
-            this.sg_id.Location = new System.Drawing.Point(1188, 91);
-            this.sg_id.Margin = new System.Windows.Forms.Padding(4);
+            this.sg_id.Location = new System.Drawing.Point(891, 73);
             this.sg_id.Name = "sg_id";
-            this.sg_id.Size = new System.Drawing.Size(239, 25);
+            this.sg_id.Size = new System.Drawing.Size(180, 21);
             this.sg_id.Str = null;
             this.sg_id.Str1 = null;
             this.sg_id.Str2 = null;
@@ -695,22 +649,20 @@
             this.pb_name.Caller = null;
             this.pb_name.Condition = null;
             this.pb_name.FormName = null;
-            this.pb_name.Location = new System.Drawing.Point(841, 34);
-            this.pb_name.Margin = new System.Windows.Forms.Padding(4);
+            this.pb_name.Location = new System.Drawing.Point(631, 27);
             this.pb_name.Name = "pb_name";
             this.pb_name.SelectField = null;
             this.pb_name.SetValueField = null;
-            this.pb_name.Size = new System.Drawing.Size(240, 26);
+            this.pb_name.Size = new System.Drawing.Size(180, 21);
             this.pb_name.TabIndex = 3;
             this.pb_name.TableName = null;
             // 
             // sg_separator
             // 
             this.sg_separator.ID = null;
-            this.sg_separator.Location = new System.Drawing.Point(1188, 34);
-            this.sg_separator.Margin = new System.Windows.Forms.Padding(4);
+            this.sg_separator.Location = new System.Drawing.Point(891, 27);
             this.sg_separator.Name = "sg_separator";
-            this.sg_separator.Size = new System.Drawing.Size(239, 25);
+            this.sg_separator.Size = new System.Drawing.Size(180, 21);
             this.sg_separator.Str = null;
             this.sg_separator.Str1 = null;
             this.sg_separator.Str2 = null;
@@ -720,10 +672,9 @@
             // 
             this.si_indexstring4.Enabled = false;
             this.si_indexstring4.ID = null;
-            this.si_indexstring4.Location = new System.Drawing.Point(473, 212);
-            this.si_indexstring4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_indexstring4.Location = new System.Drawing.Point(355, 170);
             this.si_indexstring4.Name = "si_indexstring4";
-            this.si_indexstring4.Size = new System.Drawing.Size(208, 25);
+            this.si_indexstring4.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring4.Str = null;
             this.si_indexstring4.Str1 = null;
             this.si_indexstring4.Str2 = null;
@@ -732,31 +683,28 @@
             // si_length4
             // 
             this.si_length4.Enabled = false;
-            this.si_length4.Location = new System.Drawing.Point(821, 212);
-            this.si_length4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_length4.Location = new System.Drawing.Point(616, 170);
             this.si_length4.Name = "si_length4";
             this.si_length4.Negative = false;
-            this.si_length4.Size = new System.Drawing.Size(208, 25);
+            this.si_length4.Size = new System.Drawing.Size(157, 21);
             this.si_length4.TabIndex = 88;
             // 
             // si_index4
             // 
             this.si_index4.Enabled = false;
-            this.si_index4.Location = new System.Drawing.Point(133, 212);
-            this.si_index4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_index4.Location = new System.Drawing.Point(100, 170);
             this.si_index4.Name = "si_index4";
             this.si_index4.Negative = false;
-            this.si_index4.Size = new System.Drawing.Size(208, 25);
+            this.si_index4.Size = new System.Drawing.Size(157, 21);
             this.si_index4.TabIndex = 86;
             // 
             // si_indexstring3
             // 
             this.si_indexstring3.Enabled = false;
             this.si_indexstring3.ID = null;
-            this.si_indexstring3.Location = new System.Drawing.Point(473, 607);
-            this.si_indexstring3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_indexstring3.Location = new System.Drawing.Point(355, 486);
             this.si_indexstring3.Name = "si_indexstring3";
-            this.si_indexstring3.Size = new System.Drawing.Size(208, 25);
+            this.si_indexstring3.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring3.Str = null;
             this.si_indexstring3.Str1 = null;
             this.si_indexstring3.Str2 = null;
@@ -765,31 +713,28 @@
             // si_length3
             // 
             this.si_length3.Enabled = false;
-            this.si_length3.Location = new System.Drawing.Point(821, 607);
-            this.si_length3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_length3.Location = new System.Drawing.Point(616, 486);
             this.si_length3.Name = "si_length3";
             this.si_length3.Negative = false;
-            this.si_length3.Size = new System.Drawing.Size(208, 25);
+            this.si_length3.Size = new System.Drawing.Size(157, 21);
             this.si_length3.TabIndex = 82;
             // 
             // si_index3
             // 
             this.si_index3.Enabled = false;
-            this.si_index3.Location = new System.Drawing.Point(133, 607);
-            this.si_index3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_index3.Location = new System.Drawing.Point(100, 486);
             this.si_index3.Name = "si_index3";
             this.si_index3.Negative = false;
-            this.si_index3.Size = new System.Drawing.Size(208, 25);
+            this.si_index3.Size = new System.Drawing.Size(157, 21);
             this.si_index3.TabIndex = 80;
             // 
             // si_indexstring2
             // 
             this.si_indexstring2.Enabled = false;
             this.si_indexstring2.ID = null;
-            this.si_indexstring2.Location = new System.Drawing.Point(473, 330);
-            this.si_indexstring2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_indexstring2.Location = new System.Drawing.Point(355, 264);
             this.si_indexstring2.Name = "si_indexstring2";
-            this.si_indexstring2.Size = new System.Drawing.Size(208, 25);
+            this.si_indexstring2.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring2.Str = null;
             this.si_indexstring2.Str1 = null;
             this.si_indexstring2.Str2 = null;
@@ -798,31 +743,28 @@
             // si_length2
             // 
             this.si_length2.Enabled = false;
-            this.si_length2.Location = new System.Drawing.Point(821, 330);
-            this.si_length2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_length2.Location = new System.Drawing.Point(616, 264);
             this.si_length2.Name = "si_length2";
             this.si_length2.Negative = false;
-            this.si_length2.Size = new System.Drawing.Size(208, 25);
+            this.si_length2.Size = new System.Drawing.Size(157, 21);
             this.si_length2.TabIndex = 76;
             // 
             // si_index2
             // 
             this.si_index2.Enabled = false;
-            this.si_index2.Location = new System.Drawing.Point(133, 330);
-            this.si_index2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_index2.Location = new System.Drawing.Point(100, 264);
             this.si_index2.Name = "si_index2";
             this.si_index2.Negative = false;
-            this.si_index2.Size = new System.Drawing.Size(208, 25);
+            this.si_index2.Size = new System.Drawing.Size(157, 21);
             this.si_index2.TabIndex = 74;
             // 
             // si_indexstring1
             // 
             this.si_indexstring1.Enabled = false;
             this.si_indexstring1.ID = null;
-            this.si_indexstring1.Location = new System.Drawing.Point(473, 466);
-            this.si_indexstring1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_indexstring1.Location = new System.Drawing.Point(355, 373);
             this.si_indexstring1.Name = "si_indexstring1";
-            this.si_indexstring1.Size = new System.Drawing.Size(208, 25);
+            this.si_indexstring1.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring1.Str = null;
             this.si_indexstring1.Str1 = null;
             this.si_indexstring1.Str2 = null;
@@ -831,21 +773,19 @@
             // si_index1
             // 
             this.si_index1.Enabled = false;
-            this.si_index1.Location = new System.Drawing.Point(133, 466);
-            this.si_index1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_index1.Location = new System.Drawing.Point(100, 373);
             this.si_index1.Name = "si_index1";
             this.si_index1.Negative = false;
-            this.si_index1.Size = new System.Drawing.Size(208, 25);
+            this.si_index1.Size = new System.Drawing.Size(157, 21);
             this.si_index1.TabIndex = 12;
             // 
             // si_item4
             // 
             this.si_item4.Enabled = false;
             this.si_item4.ID = null;
-            this.si_item4.Location = new System.Drawing.Point(1219, 164);
-            this.si_item4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_item4.Location = new System.Drawing.Point(914, 131);
             this.si_item4.Name = "si_item4";
-            this.si_item4.Size = new System.Drawing.Size(208, 25);
+            this.si_item4.Size = new System.Drawing.Size(157, 21);
             this.si_item4.Str = null;
             this.si_item4.Str1 = null;
             this.si_item4.Str2 = null;
@@ -857,10 +797,9 @@
             // 
             this.si_detno4.Enabled = false;
             this.si_detno4.ID = null;
-            this.si_detno4.Location = new System.Drawing.Point(133, 168);
-            this.si_detno4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_detno4.Location = new System.Drawing.Point(100, 134);
             this.si_detno4.Name = "si_detno4";
-            this.si_detno4.Size = new System.Drawing.Size(208, 25);
+            this.si_detno4.Size = new System.Drawing.Size(157, 21);
             this.si_detno4.Str = null;
             this.si_detno4.Str1 = null;
             this.si_detno4.Str2 = null;
@@ -870,10 +809,9 @@
             // 
             this.si_expression4.Enabled = false;
             this.si_expression4.ID = null;
-            this.si_expression4.Location = new System.Drawing.Point(821, 168);
-            this.si_expression4.Margin = new System.Windows.Forms.Padding(4);
+            this.si_expression4.Location = new System.Drawing.Point(616, 134);
             this.si_expression4.Name = "si_expression4";
-            this.si_expression4.Size = new System.Drawing.Size(208, 25);
+            this.si_expression4.Size = new System.Drawing.Size(157, 21);
             this.si_expression4.Str = null;
             this.si_expression4.Str1 = null;
             this.si_expression4.Str2 = null;
@@ -883,10 +821,9 @@
             // 
             this.si_item3.Enabled = false;
             this.si_item3.ID = null;
-            this.si_item3.Location = new System.Drawing.Point(1219, 558);
-            this.si_item3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_item3.Location = new System.Drawing.Point(914, 446);
             this.si_item3.Name = "si_item3";
-            this.si_item3.Size = new System.Drawing.Size(208, 25);
+            this.si_item3.Size = new System.Drawing.Size(157, 21);
             this.si_item3.Str = null;
             this.si_item3.Str1 = null;
             this.si_item3.Str2 = null;
@@ -898,10 +835,9 @@
             // 
             this.si_detno3.Enabled = false;
             this.si_detno3.ID = null;
-            this.si_detno3.Location = new System.Drawing.Point(133, 562);
-            this.si_detno3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_detno3.Location = new System.Drawing.Point(100, 450);
             this.si_detno3.Name = "si_detno3";
-            this.si_detno3.Size = new System.Drawing.Size(208, 25);
+            this.si_detno3.Size = new System.Drawing.Size(157, 21);
             this.si_detno3.Str = null;
             this.si_detno3.Str1 = null;
             this.si_detno3.Str2 = null;
@@ -911,10 +847,9 @@
             // 
             this.si_expression3.Enabled = false;
             this.si_expression3.ID = null;
-            this.si_expression3.Location = new System.Drawing.Point(821, 562);
-            this.si_expression3.Margin = new System.Windows.Forms.Padding(4);
+            this.si_expression3.Location = new System.Drawing.Point(616, 450);
             this.si_expression3.Name = "si_expression3";
-            this.si_expression3.Size = new System.Drawing.Size(208, 25);
+            this.si_expression3.Size = new System.Drawing.Size(157, 21);
             this.si_expression3.Str = null;
             this.si_expression3.Str1 = null;
             this.si_expression3.Str2 = null;
@@ -924,10 +859,9 @@
             // 
             this.si_item2.Enabled = false;
             this.si_item2.ID = null;
-            this.si_item2.Location = new System.Drawing.Point(1219, 288);
-            this.si_item2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_item2.Location = new System.Drawing.Point(914, 230);
             this.si_item2.Name = "si_item2";
-            this.si_item2.Size = new System.Drawing.Size(208, 25);
+            this.si_item2.Size = new System.Drawing.Size(157, 21);
             this.si_item2.Str = null;
             this.si_item2.Str1 = null;
             this.si_item2.Str2 = null;
@@ -939,10 +873,9 @@
             // 
             this.si_detno2.Enabled = false;
             this.si_detno2.ID = null;
-            this.si_detno2.Location = new System.Drawing.Point(133, 292);
-            this.si_detno2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_detno2.Location = new System.Drawing.Point(100, 234);
             this.si_detno2.Name = "si_detno2";
-            this.si_detno2.Size = new System.Drawing.Size(208, 25);
+            this.si_detno2.Size = new System.Drawing.Size(157, 21);
             this.si_detno2.Str = null;
             this.si_detno2.Str1 = null;
             this.si_detno2.Str2 = null;
@@ -952,10 +885,9 @@
             // 
             this.si_expression2.Enabled = false;
             this.si_expression2.ID = null;
-            this.si_expression2.Location = new System.Drawing.Point(821, 292);
-            this.si_expression2.Margin = new System.Windows.Forms.Padding(4);
+            this.si_expression2.Location = new System.Drawing.Point(616, 234);
             this.si_expression2.Name = "si_expression2";
-            this.si_expression2.Size = new System.Drawing.Size(208, 25);
+            this.si_expression2.Size = new System.Drawing.Size(157, 21);
             this.si_expression2.Str = null;
             this.si_expression2.Str1 = null;
             this.si_expression2.Str2 = null;
@@ -965,10 +897,9 @@
             // 
             this.si_item1.Enabled = false;
             this.si_item1.ID = null;
-            this.si_item1.Location = new System.Drawing.Point(1219, 419);
-            this.si_item1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_item1.Location = new System.Drawing.Point(914, 335);
             this.si_item1.Name = "si_item1";
-            this.si_item1.Size = new System.Drawing.Size(208, 25);
+            this.si_item1.Size = new System.Drawing.Size(157, 21);
             this.si_item1.Str = null;
             this.si_item1.Str1 = null;
             this.si_item1.Str2 = null;
@@ -980,10 +911,9 @@
             // 
             this.si_detno1.Enabled = false;
             this.si_detno1.ID = null;
-            this.si_detno1.Location = new System.Drawing.Point(133, 423);
-            this.si_detno1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_detno1.Location = new System.Drawing.Point(100, 338);
             this.si_detno1.Name = "si_detno1";
-            this.si_detno1.Size = new System.Drawing.Size(208, 25);
+            this.si_detno1.Size = new System.Drawing.Size(157, 21);
             this.si_detno1.Str = null;
             this.si_detno1.Str1 = null;
             this.si_detno1.Str2 = null;
@@ -993,10 +923,9 @@
             // 
             this.si_expression1.Enabled = false;
             this.si_expression1.ID = null;
-            this.si_expression1.Location = new System.Drawing.Point(821, 423);
-            this.si_expression1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_expression1.Location = new System.Drawing.Point(616, 338);
             this.si_expression1.Name = "si_expression1";
-            this.si_expression1.Size = new System.Drawing.Size(208, 25);
+            this.si_expression1.Size = new System.Drawing.Size(157, 21);
             this.si_expression1.Str = null;
             this.si_expression1.Str1 = null;
             this.si_expression1.Str2 = null;
@@ -1007,10 +936,9 @@
             this.Delete.BackColor = System.Drawing.Color.Transparent;
             this.Delete.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Delete.Image = ((System.Drawing.Image)(resources.GetObject("Delete.Image")));
-            this.Delete.Location = new System.Drawing.Point(712, 91);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4);
+            this.Delete.Location = new System.Drawing.Point(534, 73);
             this.Delete.Name = "Delete";
-            this.Delete.Size = new System.Drawing.Size(100, 36);
+            this.Delete.Size = new System.Drawing.Size(75, 29);
             this.Delete.TabIndex = 6;
             this.Delete.Text = "删除";
             this.Delete.UseVisualStyleBackColor = false;
@@ -1021,10 +949,9 @@
             this.Save.BackColor = System.Drawing.Color.Transparent;
             this.Save.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
-            this.Save.Location = new System.Drawing.Point(581, 91);
-            this.Save.Margin = new System.Windows.Forms.Padding(4);
+            this.Save.Location = new System.Drawing.Point(436, 73);
             this.Save.Name = "Save";
-            this.Save.Size = new System.Drawing.Size(100, 36);
+            this.Save.Size = new System.Drawing.Size(75, 29);
             this.Save.TabIndex = 5;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -1033,10 +960,9 @@
             // sg_name
             // 
             this.sg_name.ID = null;
-            this.sg_name.Location = new System.Drawing.Point(505, 34);
-            this.sg_name.Margin = new System.Windows.Forms.Padding(4);
+            this.sg_name.Location = new System.Drawing.Point(379, 27);
             this.sg_name.Name = "sg_name";
-            this.sg_name.Size = new System.Drawing.Size(239, 25);
+            this.sg_name.Size = new System.Drawing.Size(180, 21);
             this.sg_name.Str = null;
             this.sg_name.Str1 = null;
             this.sg_name.Str2 = null;
@@ -1045,10 +971,9 @@
             // sg_code
             // 
             this.sg_code.ID = null;
-            this.sg_code.Location = new System.Drawing.Point(133, 34);
-            this.sg_code.Margin = new System.Windows.Forms.Padding(4);
+            this.sg_code.Location = new System.Drawing.Point(100, 27);
             this.sg_code.Name = "sg_code";
-            this.sg_code.Size = new System.Drawing.Size(239, 25);
+            this.sg_code.Size = new System.Drawing.Size(180, 21);
             this.sg_code.Str = null;
             this.sg_code.Str1 = null;
             this.sg_code.Str2 = null;
@@ -1058,18 +983,17 @@
             // si_length1
             // 
             this.si_length1.Enabled = false;
-            this.si_length1.Location = new System.Drawing.Point(821, 466);
-            this.si_length1.Margin = new System.Windows.Forms.Padding(4);
+            this.si_length1.Location = new System.Drawing.Point(616, 373);
             this.si_length1.Name = "si_length1";
             this.si_length1.Negative = false;
-            this.si_length1.Size = new System.Drawing.Size(208, 25);
+            this.si_length1.Size = new System.Drawing.Size(157, 21);
             this.si_length1.TabIndex = 14;
             // 
             // 采集策略
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1442, 673);
+            this.ClientSize = new System.Drawing.Size(1082, 576);
             this.Controls.Add(this.Add);
             this.Controls.Add(this.si_id1);
             this.Controls.Add(this.si_id2);
@@ -1146,7 +1070,6 @@
             this.Controls.Add(this.sg_code);
             this.Controls.Add(this.sg_code_label);
             this.Controls.Add(this.sg_name_label);
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "采集策略";
             this.Text = "采集策略";
             this.Load += new System.EventHandler(this.采集策略_Load);