权限BUG，断开链接问题

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

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.label1 = new System.Windows.Forms.Label();
             this.UserName = new System.Windows.Forms.TextBox();
@@ -39,8 +40,10 @@
             this.Master = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.IP = new System.Windows.Forms.TextBox();
+            this.ComData = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.LoginIcon)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComData)).BeginInit();
             this.SuspendLayout();
             // 
             // pictureBox1
@@ -48,7 +51,7 @@
             this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
             this.pictureBox1.Image = global::UAS_LabelMachine.Properties.Resources.users_user_72px_523311_easyicon_net;
             this.pictureBox1.Location = new System.Drawing.Point(312, 226);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(96, 90);
             this.pictureBox1.TabIndex = 0;
@@ -71,7 +74,7 @@
             // 
             this.UserName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.UserName.Location = new System.Drawing.Point(492, 210);
-            this.UserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.UserName.Margin = new System.Windows.Forms.Padding(4);
             this.UserName.Name = "UserName";
             this.UserName.Size = new System.Drawing.Size(260, 34);
             this.UserName.TabIndex = 2;
@@ -80,7 +83,7 @@
             // 
             this.PassWord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PassWord.Location = new System.Drawing.Point(492, 258);
-            this.PassWord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PassWord.Margin = new System.Windows.Forms.Padding(4);
             this.PassWord.Name = "PassWord";
             this.PassWord.PasswordChar = '*';
             this.PassWord.Size = new System.Drawing.Size(260, 34);
@@ -93,7 +96,7 @@
             this.LoginIcon.Cursor = System.Windows.Forms.Cursors.Hand;
             this.LoginIcon.Image = global::UAS_LabelMachine.Properties.Resources.Login_Icon;
             this.LoginIcon.Location = new System.Drawing.Point(564, 404);
-            this.LoginIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.LoginIcon.Margin = new System.Windows.Forms.Padding(4);
             this.LoginIcon.Name = "LoginIcon";
             this.LoginIcon.Size = new System.Drawing.Size(96, 32);
             this.LoginIcon.TabIndex = 4;
@@ -130,7 +133,7 @@
             this.MasterCombox.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MasterCombox.FormattingEnabled = true;
             this.MasterCombox.Location = new System.Drawing.Point(492, 309);
-            this.MasterCombox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.MasterCombox.Margin = new System.Windows.Forms.Padding(4);
             this.MasterCombox.Name = "MasterCombox";
             this.MasterCombox.Size = new System.Drawing.Size(260, 35);
             this.MasterCombox.TabIndex = 7;
@@ -163,7 +166,7 @@
             // 
             this.IP.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.IP.Location = new System.Drawing.Point(492, 356);
-            this.IP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.IP.Margin = new System.Windows.Forms.Padding(4);
             this.IP.Name = "IP";
             this.IP.Size = new System.Drawing.Size(260, 34);
             this.IP.TabIndex = 9;
@@ -187,7 +190,7 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Login";
             this.Text = "出货标签管理系统";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Login_FormClosing);
@@ -195,6 +198,7 @@
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Login_Paint);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LoginIcon)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComData)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -213,5 +217,6 @@
         private System.Windows.Forms.Label Master;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.TextBox IP;
+        private System.Windows.Forms.BindingSource ComData;
     }
 }

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

@@ -29,10 +29,10 @@ namespace UAS_LabelMachine
         {
             dh = new DataHelper();
             //获取账套信息
-            dt = (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master where ma_enable<>0", "select");
-            MasterCombox.DataSource = dt;
+            dt= (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master where ma_enable<>0", "select");
             MasterCombox.DisplayMember = "ma_function";
             MasterCombox.ValueMember = "ma_user";
+            MasterCombox.DataSource = dt;
             //读取上次登陆时的用户名和选择的账套
             UserName.Text = Properties.Settings.Default.LastLoginUser;
             MasterCombox.Text = Properties.Settings.Default.LastLoginMaster;

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

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ComData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
+using UAS_LabelMachine.Entity;
 
 namespace UAS_LabelMachine
 {
@@ -38,6 +39,7 @@ namespace UAS_LabelMachine
             sql += "LPP_ALLCOLLECT) values(labelprintpower_seq.nextval,:lpp_emcode,:LPP_CLEANDETAIL,:LPP_GENCODE,:LPP_LABELMATAIN,:LPP_SAVEDETAIL,";
             sql += ":LPP_COLLECTSTRATEGY,:LPP_ALLCOLLECT)";
             dh.UpDateTableByCondition(dt.GetChanges(), "labelprintpower", "lpp_id", sql.ToLower());
+            dh.ExecuteSql("insert into MessageLog (ml_id,ml_date,ml_man,ml_content,code) select MessageLog_seq.nextval,sysdate,'"+User.UserName+"','修改打印权限','LabelPrint' from dual", "insert");
             LoadData();
         }
 

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

@@ -83,7 +83,7 @@ namespace UAS_LabelMachine
             if (ex != null)
             {
                 sb.AppendLine(ex.Message);
-                sb.AppendLine(ex.StackTrace);
+                //sb.AppendLine(ex.StackTrace);
                 //sb.AppendLine("【异常方法】：" + ex.TargetSite);
             }
             LogManager.DoLog(sb.ToString());

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

@@ -21,7 +21,7 @@ namespace UAS_LabelMachine
         //富为外网地址
         //private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达外网地址
-        private readonly string ConnectionStrings = "Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达内网地址
         //private readonly string ConnectionStrings = "Data Source=192.168.1.200/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //用户选择的数据库的连接字符串
@@ -729,7 +729,7 @@ namespace UAS_LabelMachine
                 return false;
             }
         }
-
+        int count = 0;
         /// <summary>
         /// 直接执行SQL，同时传入SQL的类型
         /// </summary>
@@ -768,13 +768,22 @@ namespace UAS_LabelMachine
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
                 }
             }
+
             switch (Type.ToUpper())
             {
                 case "SELECT":
                     result = new DataTable();
-                    OracleDataAdapter ad = new OracleDataAdapter(command);
-                    ad.Fill((DataTable)result);
-                    ad.Dispose();
+                    try
+                    {
+                        OracleDataAdapter ad = new OracleDataAdapter(command);
+                        ad.Fill((DataTable)result);
+                        ad.Dispose();
+                    }
+                    catch (Exception)
+                    {
+                        connection = new OracleConnection(DBConnectionString);
+                        result = ExecuteSql(SQL, Type, names);
+                    }
                     break;
                 case "DELETE":
                     result = command.ExecuteNonQuery();
@@ -786,6 +795,7 @@ namespace UAS_LabelMachine
                     command.ExecuteNonQuery();
                     break;
             }
+
             command.Dispose();
             return result;
         }

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

@@ -88,7 +88,7 @@ namespace UAS_Labeling.PublicMethod
                                 }
                                 break;
                             case "全部已采":
-                                if (dt.Rows[0]["LPP_CLEANDETAIL"].ToString() != "1")
+                                if (dt.Rows[0]["LPP_ALLCOLLECT"].ToString() != "1")
                                 {
                                     MessageBox.Show("没有" + c.Text + "的权限");
                                     return true;

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

@@ -129,7 +129,6 @@ namespace UAS_LabelMachine
 
         private void 贴标机条码打印_Load(object sender, EventArgs e)
         {
-            LogManager.DoLog("界面加载");
             //杀死之前全部未关闭的进程
             Process[] processes = System.Diagnostics.Process.GetProcessesByName("lppa");
             for (int i = 0; i < processes.Length; i++)

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

@@ -112,7 +112,7 @@
             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, 54);
+            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.Name = "sg_name_label";
             this.sg_name_label.Size = new System.Drawing.Size(92, 27);
@@ -124,7 +124,7 @@
             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, 54);
+            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.Name = "sg_code_label";
             this.sg_code_label.Size = new System.Drawing.Size(92, 27);
@@ -135,8 +135,8 @@
             // 
             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, 295);
-            this.si_type2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_type2.Location = new System.Drawing.Point(32, 253);
+            this.si_type2.Margin = new System.Windows.Forms.Padding(4);
             this.si_type2.Name = "si_type2";
             this.si_type2.Size = new System.Drawing.Size(93, 31);
             this.si_type2.TabIndex = 17;
@@ -147,8 +147,8 @@
             // 
             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, 425);
-            this.si_type1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_type1.Location = new System.Drawing.Point(32, 383);
+            this.si_type1.Margin = new System.Windows.Forms.Padding(4);
             this.si_type1.Name = "si_type1";
             this.si_type1.Size = new System.Drawing.Size(128, 31);
             this.si_type1.TabIndex = 18;
@@ -159,8 +159,8 @@
             // 
             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, 175);
-            this.si_type4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_type4.Location = new System.Drawing.Point(32, 133);
+            this.si_type4.Margin = new System.Windows.Forms.Padding(4);
             this.si_type4.Name = "si_type4";
             this.si_type4.Size = new System.Drawing.Size(82, 31);
             this.si_type4.TabIndex = 19;
@@ -171,8 +171,8 @@
             // 
             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, 558);
-            this.si_type3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_type3.Location = new System.Drawing.Point(32, 516);
+            this.si_type3.Margin = new System.Windows.Forms.Padding(4);
             this.si_type3.Name = "si_type3";
             this.si_type3.Size = new System.Drawing.Size(73, 31);
             this.si_type3.TabIndex = 20;
@@ -184,7 +184,7 @@
             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, 465);
+            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.Name = "si_expression1_label";
             this.si_expression1_label.Size = new System.Drawing.Size(112, 27);
@@ -196,7 +196,7 @@
             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, 465);
+            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.Name = "si_kind1_label";
             this.si_kind1_label.Size = new System.Drawing.Size(92, 27);
@@ -208,7 +208,7 @@
             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, 465);
+            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.Name = "si_detno1_label";
             this.si_detno1_label.Size = new System.Drawing.Size(92, 27);
@@ -220,7 +220,7 @@
             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, 461);
+            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.Name = "si_item1_label";
             this.si_item1_label.Size = new System.Drawing.Size(92, 27);
@@ -233,7 +233,7 @@
             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, 330);
+            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.Name = "si_item2_label";
             this.si_item2_label.Size = new System.Drawing.Size(92, 27);
@@ -246,7 +246,7 @@
             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, 334);
+            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.Name = "si_detno2_label";
             this.si_detno2_label.Size = new System.Drawing.Size(92, 27);
@@ -258,7 +258,7 @@
             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, 334);
+            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.Name = "si_kind2_label";
             this.si_kind2_label.Size = new System.Drawing.Size(92, 27);
@@ -270,7 +270,7 @@
             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, 334);
+            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.Name = "si_expression2_label";
             this.si_expression2_label.Size = new System.Drawing.Size(112, 27);
@@ -282,7 +282,7 @@
             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, 600);
+            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.Name = "si_item3_label";
             this.si_item3_label.Size = new System.Drawing.Size(92, 27);
@@ -295,7 +295,7 @@
             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, 604);
+            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.Name = "si_detno3_label";
             this.si_detno3_label.Size = new System.Drawing.Size(92, 27);
@@ -307,7 +307,7 @@
             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, 604);
+            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.Name = "si_kind3_label";
             this.si_kind3_label.Size = new System.Drawing.Size(92, 27);
@@ -319,7 +319,7 @@
             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, 604);
+            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.Name = "si_expression3_label";
             this.si_expression3_label.Size = new System.Drawing.Size(112, 27);
@@ -331,7 +331,7 @@
             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, 206);
+            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.Name = "si_item4_label";
             this.si_item4_label.Size = new System.Drawing.Size(92, 27);
@@ -344,7 +344,7 @@
             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, 210);
+            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.Name = "si_detno4_label";
             this.si_detno4_label.Size = new System.Drawing.Size(92, 27);
@@ -356,7 +356,7 @@
             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, 210);
+            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.Name = "si_kind4_label";
             this.si_kind4_label.Size = new System.Drawing.Size(92, 27);
@@ -368,7 +368,7 @@
             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, 210);
+            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.Name = "si_expression4_label";
             this.si_expression4_label.Size = new System.Drawing.Size(112, 27);
@@ -385,8 +385,8 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind1.Location = new System.Drawing.Point(473, 466);
-            this.si_kind1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_kind1.Location = new System.Drawing.Point(473, 424);
+            this.si_kind1.Margin = new System.Windows.Forms.Padding(4);
             this.si_kind1.Name = "si_kind1";
             this.si_kind1.Size = new System.Drawing.Size(208, 23);
             this.si_kind1.TabIndex = 10;
@@ -401,8 +401,8 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind2.Location = new System.Drawing.Point(473, 334);
-            this.si_kind2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_kind2.Location = new System.Drawing.Point(473, 292);
+            this.si_kind2.Margin = new System.Windows.Forms.Padding(4);
             this.si_kind2.Name = "si_kind2";
             this.si_kind2.Size = new System.Drawing.Size(208, 23);
             this.si_kind2.TabIndex = 64;
@@ -417,8 +417,8 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind3.Location = new System.Drawing.Point(473, 604);
-            this.si_kind3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_kind3.Location = new System.Drawing.Point(473, 562);
+            this.si_kind3.Margin = new System.Windows.Forms.Padding(4);
             this.si_kind3.Name = "si_kind3";
             this.si_kind3.Size = new System.Drawing.Size(208, 23);
             this.si_kind3.TabIndex = 65;
@@ -433,8 +433,8 @@
             "索引字符",
             "二次解析",
             "全部"});
-            this.si_kind4.Location = new System.Drawing.Point(473, 211);
-            this.si_kind4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_kind4.Location = new System.Drawing.Point(473, 169);
+            this.si_kind4.Margin = new System.Windows.Forms.Padding(4);
             this.si_kind4.Name = "si_kind4";
             this.si_kind4.Size = new System.Drawing.Size(208, 23);
             this.si_kind4.TabIndex = 66;
@@ -444,7 +444,7 @@
             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, 508);
+            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.Name = "si_index1_label";
             this.si_index1_label.Size = new System.Drawing.Size(92, 27);
@@ -456,7 +456,7 @@
             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, 508);
+            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.Name = "si_length1_label";
             this.si_length1_label.Size = new System.Drawing.Size(52, 27);
@@ -468,7 +468,7 @@
             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, 508);
+            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.Name = "si_indexstring1_label";
             this.si_indexstring1_label.Size = new System.Drawing.Size(92, 27);
@@ -480,7 +480,7 @@
             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, 372);
+            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.Name = "si_indexstring2_label";
             this.si_indexstring2_label.Size = new System.Drawing.Size(92, 27);
@@ -492,7 +492,7 @@
             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, 372);
+            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.Name = "si_length2_label";
             this.si_length2_label.Size = new System.Drawing.Size(52, 27);
@@ -504,7 +504,7 @@
             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, 372);
+            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.Name = "si_index2_label";
             this.si_index2_label.Size = new System.Drawing.Size(92, 27);
@@ -516,7 +516,7 @@
             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, 649);
+            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.Name = "si_indexstring3_label";
             this.si_indexstring3_label.Size = new System.Drawing.Size(92, 27);
@@ -528,7 +528,7 @@
             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, 649);
+            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.Name = "si_length3_label";
             this.si_length3_label.Size = new System.Drawing.Size(52, 27);
@@ -540,7 +540,7 @@
             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, 649);
+            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.Name = "si_index3_label";
             this.si_index3_label.Size = new System.Drawing.Size(92, 27);
@@ -552,7 +552,7 @@
             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, 254);
+            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.Name = "si_indexstring4_label";
             this.si_indexstring4_label.Size = new System.Drawing.Size(92, 27);
@@ -564,7 +564,7 @@
             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, 254);
+            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.Name = "si_length4_label";
             this.si_length4_label.Size = new System.Drawing.Size(52, 27);
@@ -576,7 +576,7 @@
             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, 254);
+            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.Name = "si_index4_label";
             this.si_index4_label.Size = new System.Drawing.Size(92, 27);
@@ -588,7 +588,7 @@
             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, 54);
+            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.Name = "sg_separator_label";
             this.sg_separator_label.Size = new System.Drawing.Size(72, 27);
@@ -600,7 +600,7 @@
             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, 54);
+            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.Name = "pb_name_label";
             this.pb_name_label.Size = new System.Drawing.Size(52, 27);
@@ -612,8 +612,8 @@
             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, 133);
-            this.Add.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Add.Location = new System.Drawing.Point(841, 91);
+            this.Add.Margin = new System.Windows.Forms.Padding(4);
             this.Add.Name = "Add";
             this.Add.Size = new System.Drawing.Size(100, 36);
             this.Add.TabIndex = 7;
@@ -625,8 +625,8 @@
             // 
             this.si_id1.Enabled = false;
             this.si_id1.ID = null;
-            this.si_id1.Location = new System.Drawing.Point(1219, 512);
-            this.si_id1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_id1.Location = new System.Drawing.Point(1219, 470);
+            this.si_id1.Margin = new System.Windows.Forms.Padding(4);
             this.si_id1.Name = "si_id1";
             this.si_id1.Size = new System.Drawing.Size(208, 25);
             this.si_id1.Str = null;
@@ -639,8 +639,8 @@
             // 
             this.si_id2.Enabled = false;
             this.si_id2.ID = null;
-            this.si_id2.Location = new System.Drawing.Point(1219, 378);
-            this.si_id2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_id2.Location = new System.Drawing.Point(1219, 336);
+            this.si_id2.Margin = new System.Windows.Forms.Padding(4);
             this.si_id2.Name = "si_id2";
             this.si_id2.Size = new System.Drawing.Size(208, 25);
             this.si_id2.Str = null;
@@ -653,8 +653,8 @@
             // 
             this.si_id3.Enabled = false;
             this.si_id3.ID = null;
-            this.si_id3.Location = new System.Drawing.Point(1219, 649);
-            this.si_id3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_id3.Location = new System.Drawing.Point(1219, 607);
+            this.si_id3.Margin = new System.Windows.Forms.Padding(4);
             this.si_id3.Name = "si_id3";
             this.si_id3.Size = new System.Drawing.Size(208, 25);
             this.si_id3.Str = null;
@@ -667,8 +667,8 @@
             // 
             this.si_id4.Enabled = false;
             this.si_id4.ID = null;
-            this.si_id4.Location = new System.Drawing.Point(1219, 259);
-            this.si_id4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_id4.Location = new System.Drawing.Point(1219, 217);
+            this.si_id4.Margin = new System.Windows.Forms.Padding(4);
             this.si_id4.Name = "si_id4";
             this.si_id4.Size = new System.Drawing.Size(208, 25);
             this.si_id4.Str = null;
@@ -680,8 +680,8 @@
             // sg_id
             // 
             this.sg_id.ID = null;
-            this.sg_id.Location = new System.Drawing.Point(1188, 111);
-            this.sg_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sg_id.Location = new System.Drawing.Point(1188, 91);
+            this.sg_id.Margin = new System.Windows.Forms.Padding(4);
             this.sg_id.Name = "sg_id";
             this.sg_id.Size = new System.Drawing.Size(239, 25);
             this.sg_id.Str = null;
@@ -695,8 +695,8 @@
             this.pb_name.Caller = null;
             this.pb_name.Condition = null;
             this.pb_name.FormName = null;
-            this.pb_name.Location = new System.Drawing.Point(841, 54);
-            this.pb_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pb_name.Location = new System.Drawing.Point(841, 34);
+            this.pb_name.Margin = new System.Windows.Forms.Padding(4);
             this.pb_name.Name = "pb_name";
             this.pb_name.SelectField = null;
             this.pb_name.SetValueField = null;
@@ -707,8 +707,8 @@
             // sg_separator
             // 
             this.sg_separator.ID = null;
-            this.sg_separator.Location = new System.Drawing.Point(1188, 54);
-            this.sg_separator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sg_separator.Location = new System.Drawing.Point(1188, 34);
+            this.sg_separator.Margin = new System.Windows.Forms.Padding(4);
             this.sg_separator.Name = "sg_separator";
             this.sg_separator.Size = new System.Drawing.Size(239, 25);
             this.sg_separator.Str = null;
@@ -720,8 +720,8 @@
             // 
             this.si_indexstring4.Enabled = false;
             this.si_indexstring4.ID = null;
-            this.si_indexstring4.Location = new System.Drawing.Point(473, 254);
-            this.si_indexstring4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_indexstring4.Location = new System.Drawing.Point(473, 212);
+            this.si_indexstring4.Margin = new System.Windows.Forms.Padding(4);
             this.si_indexstring4.Name = "si_indexstring4";
             this.si_indexstring4.Size = new System.Drawing.Size(208, 25);
             this.si_indexstring4.Str = null;
@@ -732,8 +732,8 @@
             // si_length4
             // 
             this.si_length4.Enabled = false;
-            this.si_length4.Location = new System.Drawing.Point(821, 254);
-            this.si_length4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_length4.Location = new System.Drawing.Point(821, 212);
+            this.si_length4.Margin = new System.Windows.Forms.Padding(4);
             this.si_length4.Name = "si_length4";
             this.si_length4.Negative = false;
             this.si_length4.Size = new System.Drawing.Size(208, 25);
@@ -742,8 +742,8 @@
             // si_index4
             // 
             this.si_index4.Enabled = false;
-            this.si_index4.Location = new System.Drawing.Point(133, 254);
-            this.si_index4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_index4.Location = new System.Drawing.Point(133, 212);
+            this.si_index4.Margin = new System.Windows.Forms.Padding(4);
             this.si_index4.Name = "si_index4";
             this.si_index4.Negative = false;
             this.si_index4.Size = new System.Drawing.Size(208, 25);
@@ -753,8 +753,8 @@
             // 
             this.si_indexstring3.Enabled = false;
             this.si_indexstring3.ID = null;
-            this.si_indexstring3.Location = new System.Drawing.Point(473, 649);
-            this.si_indexstring3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_indexstring3.Location = new System.Drawing.Point(473, 607);
+            this.si_indexstring3.Margin = new System.Windows.Forms.Padding(4);
             this.si_indexstring3.Name = "si_indexstring3";
             this.si_indexstring3.Size = new System.Drawing.Size(208, 25);
             this.si_indexstring3.Str = null;
@@ -765,8 +765,8 @@
             // si_length3
             // 
             this.si_length3.Enabled = false;
-            this.si_length3.Location = new System.Drawing.Point(821, 649);
-            this.si_length3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_length3.Location = new System.Drawing.Point(821, 607);
+            this.si_length3.Margin = new System.Windows.Forms.Padding(4);
             this.si_length3.Name = "si_length3";
             this.si_length3.Negative = false;
             this.si_length3.Size = new System.Drawing.Size(208, 25);
@@ -775,8 +775,8 @@
             // si_index3
             // 
             this.si_index3.Enabled = false;
-            this.si_index3.Location = new System.Drawing.Point(133, 649);
-            this.si_index3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_index3.Location = new System.Drawing.Point(133, 607);
+            this.si_index3.Margin = new System.Windows.Forms.Padding(4);
             this.si_index3.Name = "si_index3";
             this.si_index3.Negative = false;
             this.si_index3.Size = new System.Drawing.Size(208, 25);
@@ -786,8 +786,8 @@
             // 
             this.si_indexstring2.Enabled = false;
             this.si_indexstring2.ID = null;
-            this.si_indexstring2.Location = new System.Drawing.Point(473, 372);
-            this.si_indexstring2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_indexstring2.Location = new System.Drawing.Point(473, 330);
+            this.si_indexstring2.Margin = new System.Windows.Forms.Padding(4);
             this.si_indexstring2.Name = "si_indexstring2";
             this.si_indexstring2.Size = new System.Drawing.Size(208, 25);
             this.si_indexstring2.Str = null;
@@ -798,8 +798,8 @@
             // si_length2
             // 
             this.si_length2.Enabled = false;
-            this.si_length2.Location = new System.Drawing.Point(821, 372);
-            this.si_length2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_length2.Location = new System.Drawing.Point(821, 330);
+            this.si_length2.Margin = new System.Windows.Forms.Padding(4);
             this.si_length2.Name = "si_length2";
             this.si_length2.Negative = false;
             this.si_length2.Size = new System.Drawing.Size(208, 25);
@@ -808,8 +808,8 @@
             // si_index2
             // 
             this.si_index2.Enabled = false;
-            this.si_index2.Location = new System.Drawing.Point(133, 372);
-            this.si_index2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_index2.Location = new System.Drawing.Point(133, 330);
+            this.si_index2.Margin = new System.Windows.Forms.Padding(4);
             this.si_index2.Name = "si_index2";
             this.si_index2.Negative = false;
             this.si_index2.Size = new System.Drawing.Size(208, 25);
@@ -819,8 +819,8 @@
             // 
             this.si_indexstring1.Enabled = false;
             this.si_indexstring1.ID = null;
-            this.si_indexstring1.Location = new System.Drawing.Point(473, 508);
-            this.si_indexstring1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_indexstring1.Location = new System.Drawing.Point(473, 466);
+            this.si_indexstring1.Margin = new System.Windows.Forms.Padding(4);
             this.si_indexstring1.Name = "si_indexstring1";
             this.si_indexstring1.Size = new System.Drawing.Size(208, 25);
             this.si_indexstring1.Str = null;
@@ -831,8 +831,8 @@
             // si_index1
             // 
             this.si_index1.Enabled = false;
-            this.si_index1.Location = new System.Drawing.Point(133, 508);
-            this.si_index1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_index1.Location = new System.Drawing.Point(133, 466);
+            this.si_index1.Margin = new System.Windows.Forms.Padding(4);
             this.si_index1.Name = "si_index1";
             this.si_index1.Negative = false;
             this.si_index1.Size = new System.Drawing.Size(208, 25);
@@ -842,8 +842,8 @@
             // 
             this.si_item4.Enabled = false;
             this.si_item4.ID = null;
-            this.si_item4.Location = new System.Drawing.Point(1219, 206);
-            this.si_item4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_item4.Location = new System.Drawing.Point(1219, 164);
+            this.si_item4.Margin = new System.Windows.Forms.Padding(4);
             this.si_item4.Name = "si_item4";
             this.si_item4.Size = new System.Drawing.Size(208, 25);
             this.si_item4.Str = null;
@@ -857,8 +857,8 @@
             // 
             this.si_detno4.Enabled = false;
             this.si_detno4.ID = null;
-            this.si_detno4.Location = new System.Drawing.Point(133, 210);
-            this.si_detno4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_detno4.Location = new System.Drawing.Point(133, 168);
+            this.si_detno4.Margin = new System.Windows.Forms.Padding(4);
             this.si_detno4.Name = "si_detno4";
             this.si_detno4.Size = new System.Drawing.Size(208, 25);
             this.si_detno4.Str = null;
@@ -870,8 +870,8 @@
             // 
             this.si_expression4.Enabled = false;
             this.si_expression4.ID = null;
-            this.si_expression4.Location = new System.Drawing.Point(821, 210);
-            this.si_expression4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_expression4.Location = new System.Drawing.Point(821, 168);
+            this.si_expression4.Margin = new System.Windows.Forms.Padding(4);
             this.si_expression4.Name = "si_expression4";
             this.si_expression4.Size = new System.Drawing.Size(208, 25);
             this.si_expression4.Str = null;
@@ -883,8 +883,8 @@
             // 
             this.si_item3.Enabled = false;
             this.si_item3.ID = null;
-            this.si_item3.Location = new System.Drawing.Point(1219, 600);
-            this.si_item3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_item3.Location = new System.Drawing.Point(1219, 558);
+            this.si_item3.Margin = new System.Windows.Forms.Padding(4);
             this.si_item3.Name = "si_item3";
             this.si_item3.Size = new System.Drawing.Size(208, 25);
             this.si_item3.Str = null;
@@ -898,8 +898,8 @@
             // 
             this.si_detno3.Enabled = false;
             this.si_detno3.ID = null;
-            this.si_detno3.Location = new System.Drawing.Point(133, 604);
-            this.si_detno3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_detno3.Location = new System.Drawing.Point(133, 562);
+            this.si_detno3.Margin = new System.Windows.Forms.Padding(4);
             this.si_detno3.Name = "si_detno3";
             this.si_detno3.Size = new System.Drawing.Size(208, 25);
             this.si_detno3.Str = null;
@@ -911,8 +911,8 @@
             // 
             this.si_expression3.Enabled = false;
             this.si_expression3.ID = null;
-            this.si_expression3.Location = new System.Drawing.Point(821, 604);
-            this.si_expression3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_expression3.Location = new System.Drawing.Point(821, 562);
+            this.si_expression3.Margin = new System.Windows.Forms.Padding(4);
             this.si_expression3.Name = "si_expression3";
             this.si_expression3.Size = new System.Drawing.Size(208, 25);
             this.si_expression3.Str = null;
@@ -924,8 +924,8 @@
             // 
             this.si_item2.Enabled = false;
             this.si_item2.ID = null;
-            this.si_item2.Location = new System.Drawing.Point(1219, 330);
-            this.si_item2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_item2.Location = new System.Drawing.Point(1219, 288);
+            this.si_item2.Margin = new System.Windows.Forms.Padding(4);
             this.si_item2.Name = "si_item2";
             this.si_item2.Size = new System.Drawing.Size(208, 25);
             this.si_item2.Str = null;
@@ -939,8 +939,8 @@
             // 
             this.si_detno2.Enabled = false;
             this.si_detno2.ID = null;
-            this.si_detno2.Location = new System.Drawing.Point(133, 334);
-            this.si_detno2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_detno2.Location = new System.Drawing.Point(133, 292);
+            this.si_detno2.Margin = new System.Windows.Forms.Padding(4);
             this.si_detno2.Name = "si_detno2";
             this.si_detno2.Size = new System.Drawing.Size(208, 25);
             this.si_detno2.Str = null;
@@ -952,8 +952,8 @@
             // 
             this.si_expression2.Enabled = false;
             this.si_expression2.ID = null;
-            this.si_expression2.Location = new System.Drawing.Point(821, 334);
-            this.si_expression2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_expression2.Location = new System.Drawing.Point(821, 292);
+            this.si_expression2.Margin = new System.Windows.Forms.Padding(4);
             this.si_expression2.Name = "si_expression2";
             this.si_expression2.Size = new System.Drawing.Size(208, 25);
             this.si_expression2.Str = null;
@@ -965,8 +965,8 @@
             // 
             this.si_item1.Enabled = false;
             this.si_item1.ID = null;
-            this.si_item1.Location = new System.Drawing.Point(1219, 461);
-            this.si_item1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_item1.Location = new System.Drawing.Point(1219, 419);
+            this.si_item1.Margin = new System.Windows.Forms.Padding(4);
             this.si_item1.Name = "si_item1";
             this.si_item1.Size = new System.Drawing.Size(208, 25);
             this.si_item1.Str = null;
@@ -980,8 +980,8 @@
             // 
             this.si_detno1.Enabled = false;
             this.si_detno1.ID = null;
-            this.si_detno1.Location = new System.Drawing.Point(133, 465);
-            this.si_detno1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_detno1.Location = new System.Drawing.Point(133, 423);
+            this.si_detno1.Margin = new System.Windows.Forms.Padding(4);
             this.si_detno1.Name = "si_detno1";
             this.si_detno1.Size = new System.Drawing.Size(208, 25);
             this.si_detno1.Str = null;
@@ -993,8 +993,8 @@
             // 
             this.si_expression1.Enabled = false;
             this.si_expression1.ID = null;
-            this.si_expression1.Location = new System.Drawing.Point(821, 465);
-            this.si_expression1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_expression1.Location = new System.Drawing.Point(821, 423);
+            this.si_expression1.Margin = new System.Windows.Forms.Padding(4);
             this.si_expression1.Name = "si_expression1";
             this.si_expression1.Size = new System.Drawing.Size(208, 25);
             this.si_expression1.Str = null;
@@ -1007,8 +1007,8 @@
             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, 133);
-            this.Delete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Delete.Location = new System.Drawing.Point(712, 91);
+            this.Delete.Margin = new System.Windows.Forms.Padding(4);
             this.Delete.Name = "Delete";
             this.Delete.Size = new System.Drawing.Size(100, 36);
             this.Delete.TabIndex = 6;
@@ -1021,8 +1021,8 @@
             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, 133);
-            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Save.Location = new System.Drawing.Point(581, 91);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.Name = "Save";
             this.Save.Size = new System.Drawing.Size(100, 36);
             this.Save.TabIndex = 5;
@@ -1033,8 +1033,8 @@
             // sg_name
             // 
             this.sg_name.ID = null;
-            this.sg_name.Location = new System.Drawing.Point(505, 54);
-            this.sg_name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sg_name.Location = new System.Drawing.Point(505, 34);
+            this.sg_name.Margin = new System.Windows.Forms.Padding(4);
             this.sg_name.Name = "sg_name";
             this.sg_name.Size = new System.Drawing.Size(239, 25);
             this.sg_name.Str = null;
@@ -1045,8 +1045,8 @@
             // sg_code
             // 
             this.sg_code.ID = null;
-            this.sg_code.Location = new System.Drawing.Point(133, 54);
-            this.sg_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sg_code.Location = new System.Drawing.Point(133, 34);
+            this.sg_code.Margin = new System.Windows.Forms.Padding(4);
             this.sg_code.Name = "sg_code";
             this.sg_code.Size = new System.Drawing.Size(239, 25);
             this.sg_code.Str = null;
@@ -1058,8 +1058,8 @@
             // si_length1
             // 
             this.si_length1.Enabled = false;
-            this.si_length1.Location = new System.Drawing.Point(821, 508);
-            this.si_length1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.si_length1.Location = new System.Drawing.Point(821, 466);
+            this.si_length1.Margin = new System.Windows.Forms.Padding(4);
             this.si_length1.Name = "si_length1";
             this.si_length1.Negative = false;
             this.si_length1.Size = new System.Drawing.Size(208, 25);
@@ -1069,7 +1069,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1442, 714);
+            this.ClientSize = new System.Drawing.Size(1442, 673);
             this.Controls.Add(this.Add);
             this.Controls.Add(this.si_id1);
             this.Controls.Add(this.si_id2);
@@ -1146,7 +1146,7 @@
             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, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "采集策略";
             this.Text = "采集策略";
             this.Load += new System.EventHandler(this.采集策略_Load);

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

@@ -208,7 +208,6 @@ namespace UAS_LabelMachine
                             //如果Item和CheckBox的文字相等
                             if (dt.Rows[i]["si_item"].ToString() == Controls["si_type" + j].Text)
                             {
-                                Console.WriteLine(dt.Rows[i]["si_item"].ToString());
                                 //如果状态不为0则表示启用
                                 if (dt.Rows[i]["si_enable"].ToString() != "0")
                                     (Controls["si_type" + j] as CheckBox).CheckState = CheckState.Checked;