添加同项采集顺序

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

@@ -305,7 +305,7 @@ namespace UAS_LabelMachine
         private void sg_code_UserControlTextChanged(object sender, EventArgs e)
         {
             //取已启用的的按照采集次序排序
-            dt = (DataTable)dh.ExecuteSql("select si_item,si_detno,sg_separator,si_kind,si_expression,si_expressionitem,si_index,si_indexstring,si_length from scanitem left join scangroup on si_sgid=sg_id where sg_code='" + sg_code.Text + "' and si_enable<>0 order by si_detno", "select");
+            dt = (DataTable)dh.ExecuteSql("select si_item,si_detno,sg_separator,si_kind,si_expression,si_expressionitem,si_index,si_indexstring,si_length from scanitem left join scangroup on si_sgid=sg_id where sg_code='" + sg_code.Text + "' and si_enable<>0 order by si_detno,si_innerdetno", "select");
             BaseUtil.FillDgvWithDataTable(Si_ItemDGV, dt);
             if (dt.Rows.Count > 0)
             {

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

@@ -131,6 +131,16 @@
             this.si_expression5 = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.si_expression5_label = new System.Windows.Forms.Label();
             this.si_type5 = new System.Windows.Forms.CheckBox();
+            this.si_innerdetno4 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_innerdetno4_label = new System.Windows.Forms.Label();
+            this.si_innerdetno2 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_innerdetno2_label = new System.Windows.Forms.Label();
+            this.si_innerdetno1 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_innerdetno1_label = new System.Windows.Forms.Label();
+            this.si_innerdetno3 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_innerdetno3_label = new System.Windows.Forms.Label();
+            this.si_innerdetno5 = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.si_innerdetno5_label = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // sg_name_label
@@ -444,7 +454,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(20, 373);
+            this.si_index1_label.Location = new System.Drawing.Point(268, 372);
             this.si_index1_label.Name = "si_index1_label";
             this.si_index1_label.Size = new System.Drawing.Size(74, 21);
             this.si_index1_label.TabIndex = 67;
@@ -455,7 +465,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(518, 373);
+            this.si_length1_label.Location = new System.Drawing.Point(783, 372);
             this.si_length1_label.Name = "si_length1_label";
             this.si_length1_label.Size = new System.Drawing.Size(42, 21);
             this.si_length1_label.TabIndex = 69;
@@ -466,7 +476,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(268, 373);
+            this.si_indexstring1_label.Location = new System.Drawing.Point(518, 372);
             this.si_indexstring1_label.Name = "si_indexstring1_label";
             this.si_indexstring1_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring1_label.TabIndex = 71;
@@ -477,7 +487,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(268, 264);
+            this.si_indexstring2_label.Location = new System.Drawing.Point(518, 265);
             this.si_indexstring2_label.Name = "si_indexstring2_label";
             this.si_indexstring2_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring2_label.TabIndex = 77;
@@ -488,7 +498,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(518, 264);
+            this.si_length2_label.Location = new System.Drawing.Point(783, 265);
             this.si_length2_label.Name = "si_length2_label";
             this.si_length2_label.Size = new System.Drawing.Size(42, 21);
             this.si_length2_label.TabIndex = 75;
@@ -499,7 +509,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(20, 264);
+            this.si_index2_label.Location = new System.Drawing.Point(268, 265);
             this.si_index2_label.Name = "si_index2_label";
             this.si_index2_label.Size = new System.Drawing.Size(74, 21);
             this.si_index2_label.TabIndex = 73;
@@ -510,7 +520,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(268, 486);
+            this.si_indexstring3_label.Location = new System.Drawing.Point(518, 486);
             this.si_indexstring3_label.Name = "si_indexstring3_label";
             this.si_indexstring3_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring3_label.TabIndex = 83;
@@ -521,7 +531,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(518, 486);
+            this.si_length3_label.Location = new System.Drawing.Point(783, 486);
             this.si_length3_label.Name = "si_length3_label";
             this.si_length3_label.Size = new System.Drawing.Size(42, 21);
             this.si_length3_label.TabIndex = 81;
@@ -532,7 +542,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(20, 486);
+            this.si_index3_label.Location = new System.Drawing.Point(268, 486);
             this.si_index3_label.Name = "si_index3_label";
             this.si_index3_label.Size = new System.Drawing.Size(74, 21);
             this.si_index3_label.TabIndex = 79;
@@ -543,7 +553,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(268, 170);
+            this.si_indexstring4_label.Location = new System.Drawing.Point(518, 174);
             this.si_indexstring4_label.Name = "si_indexstring4_label";
             this.si_indexstring4_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring4_label.TabIndex = 89;
@@ -554,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(518, 170);
+            this.si_length4_label.Location = new System.Drawing.Point(783, 174);
             this.si_length4_label.Name = "si_length4_label";
             this.si_length4_label.Size = new System.Drawing.Size(42, 21);
             this.si_length4_label.TabIndex = 87;
@@ -565,7 +575,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(20, 170);
+            this.si_index4_label.Location = new System.Drawing.Point(268, 174);
             this.si_index4_label.Name = "si_index4_label";
             this.si_index4_label.Size = new System.Drawing.Size(74, 21);
             this.si_index4_label.TabIndex = 85;
@@ -672,16 +682,21 @@
             // 
             // pb_name
             // 
+            this.pb_name.AllPower = null;
             this.pb_name.Caller = null;
             this.pb_name.Condition = null;
+            this.pb_name.DBTitle = null;
             this.pb_name.FormName = null;
             this.pb_name.Location = new System.Drawing.Point(631, 27);
             this.pb_name.Name = "pb_name";
+            this.pb_name.Power = null;
+            this.pb_name.ReturnData = null;
             this.pb_name.SelectField = null;
             this.pb_name.SetValueField = null;
             this.pb_name.Size = new System.Drawing.Size(180, 21);
             this.pb_name.TabIndex = 3;
             this.pb_name.TableName = null;
+            this.pb_name.TextBoxEnable = false;
             // 
             // sg_separator
             // 
@@ -698,7 +713,7 @@
             // 
             this.si_indexstring4.Enabled = false;
             this.si_indexstring4.ID = null;
-            this.si_indexstring4.Location = new System.Drawing.Point(355, 170);
+            this.si_indexstring4.Location = new System.Drawing.Point(616, 174);
             this.si_indexstring4.Name = "si_indexstring4";
             this.si_indexstring4.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring4.Str = null;
@@ -709,7 +724,7 @@
             // si_length4
             // 
             this.si_length4.Enabled = false;
-            this.si_length4.Location = new System.Drawing.Point(616, 170);
+            this.si_length4.Location = new System.Drawing.Point(831, 174);
             this.si_length4.Name = "si_length4";
             this.si_length4.Negative = false;
             this.si_length4.Size = new System.Drawing.Size(157, 21);
@@ -718,7 +733,7 @@
             // si_index4
             // 
             this.si_index4.Enabled = false;
-            this.si_index4.Location = new System.Drawing.Point(100, 170);
+            this.si_index4.Location = new System.Drawing.Point(355, 174);
             this.si_index4.Name = "si_index4";
             this.si_index4.Negative = false;
             this.si_index4.Size = new System.Drawing.Size(157, 21);
@@ -728,7 +743,7 @@
             // 
             this.si_indexstring3.Enabled = false;
             this.si_indexstring3.ID = null;
-            this.si_indexstring3.Location = new System.Drawing.Point(355, 486);
+            this.si_indexstring3.Location = new System.Drawing.Point(616, 486);
             this.si_indexstring3.Name = "si_indexstring3";
             this.si_indexstring3.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring3.Str = null;
@@ -739,7 +754,7 @@
             // si_length3
             // 
             this.si_length3.Enabled = false;
-            this.si_length3.Location = new System.Drawing.Point(616, 486);
+            this.si_length3.Location = new System.Drawing.Point(831, 486);
             this.si_length3.Name = "si_length3";
             this.si_length3.Negative = false;
             this.si_length3.Size = new System.Drawing.Size(157, 21);
@@ -748,7 +763,7 @@
             // si_index3
             // 
             this.si_index3.Enabled = false;
-            this.si_index3.Location = new System.Drawing.Point(100, 486);
+            this.si_index3.Location = new System.Drawing.Point(355, 486);
             this.si_index3.Name = "si_index3";
             this.si_index3.Negative = false;
             this.si_index3.Size = new System.Drawing.Size(157, 21);
@@ -758,7 +773,7 @@
             // 
             this.si_indexstring2.Enabled = false;
             this.si_indexstring2.ID = null;
-            this.si_indexstring2.Location = new System.Drawing.Point(355, 264);
+            this.si_indexstring2.Location = new System.Drawing.Point(616, 265);
             this.si_indexstring2.Name = "si_indexstring2";
             this.si_indexstring2.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring2.Str = null;
@@ -769,7 +784,7 @@
             // si_length2
             // 
             this.si_length2.Enabled = false;
-            this.si_length2.Location = new System.Drawing.Point(616, 264);
+            this.si_length2.Location = new System.Drawing.Point(831, 265);
             this.si_length2.Name = "si_length2";
             this.si_length2.Negative = false;
             this.si_length2.Size = new System.Drawing.Size(157, 21);
@@ -778,7 +793,7 @@
             // si_index2
             // 
             this.si_index2.Enabled = false;
-            this.si_index2.Location = new System.Drawing.Point(100, 264);
+            this.si_index2.Location = new System.Drawing.Point(353, 265);
             this.si_index2.Name = "si_index2";
             this.si_index2.Negative = false;
             this.si_index2.Size = new System.Drawing.Size(157, 21);
@@ -788,7 +803,7 @@
             // 
             this.si_indexstring1.Enabled = false;
             this.si_indexstring1.ID = null;
-            this.si_indexstring1.Location = new System.Drawing.Point(355, 373);
+            this.si_indexstring1.Location = new System.Drawing.Point(616, 372);
             this.si_indexstring1.Name = "si_indexstring1";
             this.si_indexstring1.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring1.Str = null;
@@ -799,7 +814,7 @@
             // si_index1
             // 
             this.si_index1.Enabled = false;
-            this.si_index1.Location = new System.Drawing.Point(100, 373);
+            this.si_index1.Location = new System.Drawing.Point(355, 372);
             this.si_index1.Name = "si_index1";
             this.si_index1.Negative = false;
             this.si_index1.Size = new System.Drawing.Size(157, 21);
@@ -1009,7 +1024,7 @@
             // si_length1
             // 
             this.si_length1.Enabled = false;
-            this.si_length1.Location = new System.Drawing.Point(616, 373);
+            this.si_length1.Location = new System.Drawing.Point(831, 372);
             this.si_length1.Name = "si_length1";
             this.si_length1.Negative = false;
             this.si_length1.Size = new System.Drawing.Size(157, 21);
@@ -1147,7 +1162,7 @@
             // 
             this.si_indexstring5.Enabled = false;
             this.si_indexstring5.ID = null;
-            this.si_indexstring5.Location = new System.Drawing.Point(355, 594);
+            this.si_indexstring5.Location = new System.Drawing.Point(616, 594);
             this.si_indexstring5.Name = "si_indexstring5";
             this.si_indexstring5.Size = new System.Drawing.Size(157, 21);
             this.si_indexstring5.Str = null;
@@ -1160,7 +1175,7 @@
             this.si_indexstring5_label.AutoSize = true;
             this.si_indexstring5_label.BackColor = System.Drawing.Color.Transparent;
             this.si_indexstring5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_indexstring5_label.Location = new System.Drawing.Point(268, 594);
+            this.si_indexstring5_label.Location = new System.Drawing.Point(518, 594);
             this.si_indexstring5_label.Name = "si_indexstring5_label";
             this.si_indexstring5_label.Size = new System.Drawing.Size(74, 21);
             this.si_indexstring5_label.TabIndex = 133;
@@ -1169,7 +1184,7 @@
             // si_length5
             // 
             this.si_length5.Enabled = false;
-            this.si_length5.Location = new System.Drawing.Point(616, 594);
+            this.si_length5.Location = new System.Drawing.Point(831, 594);
             this.si_length5.Name = "si_length5";
             this.si_length5.Negative = false;
             this.si_length5.Size = new System.Drawing.Size(157, 21);
@@ -1180,7 +1195,7 @@
             this.si_length5_label.AutoSize = true;
             this.si_length5_label.BackColor = System.Drawing.Color.Transparent;
             this.si_length5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_length5_label.Location = new System.Drawing.Point(518, 594);
+            this.si_length5_label.Location = new System.Drawing.Point(783, 594);
             this.si_length5_label.Name = "si_length5_label";
             this.si_length5_label.Size = new System.Drawing.Size(42, 21);
             this.si_length5_label.TabIndex = 131;
@@ -1189,7 +1204,7 @@
             // si_index5
             // 
             this.si_index5.Enabled = false;
-            this.si_index5.Location = new System.Drawing.Point(100, 594);
+            this.si_index5.Location = new System.Drawing.Point(355, 594);
             this.si_index5.Name = "si_index5";
             this.si_index5.Negative = false;
             this.si_index5.Size = new System.Drawing.Size(157, 21);
@@ -1200,7 +1215,7 @@
             this.si_index5_label.AutoSize = true;
             this.si_index5_label.BackColor = System.Drawing.Color.Transparent;
             this.si_index5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.si_index5_label.Location = new System.Drawing.Point(20, 594);
+            this.si_index5_label.Location = new System.Drawing.Point(268, 594);
             this.si_index5_label.Name = "si_index5_label";
             this.si_index5_label.Size = new System.Drawing.Size(74, 21);
             this.si_index5_label.TabIndex = 129;
@@ -1315,11 +1330,136 @@
             this.si_type5.Text = "品牌";
             this.si_type5.UseVisualStyleBackColor = true;
             // 
+            // si_innerdetno4
+            // 
+            this.si_innerdetno4.Enabled = false;
+            this.si_innerdetno4.ID = null;
+            this.si_innerdetno4.Location = new System.Drawing.Point(100, 174);
+            this.si_innerdetno4.Name = "si_innerdetno4";
+            this.si_innerdetno4.Size = new System.Drawing.Size(157, 21);
+            this.si_innerdetno4.Str = null;
+            this.si_innerdetno4.Str1 = null;
+            this.si_innerdetno4.Str2 = null;
+            this.si_innerdetno4.TabIndex = 139;
+            // 
+            // si_innerdetno4_label
+            // 
+            this.si_innerdetno4_label.AutoSize = true;
+            this.si_innerdetno4_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_innerdetno4_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_innerdetno4_label.Location = new System.Drawing.Point(20, 174);
+            this.si_innerdetno4_label.Name = "si_innerdetno4_label";
+            this.si_innerdetno4_label.Size = new System.Drawing.Size(74, 21);
+            this.si_innerdetno4_label.TabIndex = 138;
+            this.si_innerdetno4_label.Text = "同项次序";
+            // 
+            // si_innerdetno2
+            // 
+            this.si_innerdetno2.Enabled = false;
+            this.si_innerdetno2.ID = null;
+            this.si_innerdetno2.Location = new System.Drawing.Point(98, 265);
+            this.si_innerdetno2.Name = "si_innerdetno2";
+            this.si_innerdetno2.Size = new System.Drawing.Size(157, 21);
+            this.si_innerdetno2.Str = null;
+            this.si_innerdetno2.Str1 = null;
+            this.si_innerdetno2.Str2 = null;
+            this.si_innerdetno2.TabIndex = 141;
+            // 
+            // si_innerdetno2_label
+            // 
+            this.si_innerdetno2_label.AutoSize = true;
+            this.si_innerdetno2_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_innerdetno2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_innerdetno2_label.Location = new System.Drawing.Point(18, 265);
+            this.si_innerdetno2_label.Name = "si_innerdetno2_label";
+            this.si_innerdetno2_label.Size = new System.Drawing.Size(74, 21);
+            this.si_innerdetno2_label.TabIndex = 140;
+            this.si_innerdetno2_label.Text = "同项次序";
+            // 
+            // si_innerdetno1
+            // 
+            this.si_innerdetno1.Enabled = false;
+            this.si_innerdetno1.ID = null;
+            this.si_innerdetno1.Location = new System.Drawing.Point(100, 372);
+            this.si_innerdetno1.Name = "si_innerdetno1";
+            this.si_innerdetno1.Size = new System.Drawing.Size(157, 21);
+            this.si_innerdetno1.Str = null;
+            this.si_innerdetno1.Str1 = null;
+            this.si_innerdetno1.Str2 = null;
+            this.si_innerdetno1.TabIndex = 143;
+            // 
+            // si_innerdetno1_label
+            // 
+            this.si_innerdetno1_label.AutoSize = true;
+            this.si_innerdetno1_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_innerdetno1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_innerdetno1_label.Location = new System.Drawing.Point(20, 372);
+            this.si_innerdetno1_label.Name = "si_innerdetno1_label";
+            this.si_innerdetno1_label.Size = new System.Drawing.Size(74, 21);
+            this.si_innerdetno1_label.TabIndex = 142;
+            this.si_innerdetno1_label.Text = "同项次序";
+            // 
+            // si_innerdetno3
+            // 
+            this.si_innerdetno3.Enabled = false;
+            this.si_innerdetno3.ID = null;
+            this.si_innerdetno3.Location = new System.Drawing.Point(100, 482);
+            this.si_innerdetno3.Name = "si_innerdetno3";
+            this.si_innerdetno3.Size = new System.Drawing.Size(157, 21);
+            this.si_innerdetno3.Str = null;
+            this.si_innerdetno3.Str1 = null;
+            this.si_innerdetno3.Str2 = null;
+            this.si_innerdetno3.TabIndex = 145;
+            // 
+            // si_innerdetno3_label
+            // 
+            this.si_innerdetno3_label.AutoSize = true;
+            this.si_innerdetno3_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_innerdetno3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_innerdetno3_label.Location = new System.Drawing.Point(20, 482);
+            this.si_innerdetno3_label.Name = "si_innerdetno3_label";
+            this.si_innerdetno3_label.Size = new System.Drawing.Size(74, 21);
+            this.si_innerdetno3_label.TabIndex = 144;
+            this.si_innerdetno3_label.Text = "同项次序";
+            // 
+            // si_innerdetno5
+            // 
+            this.si_innerdetno5.Enabled = false;
+            this.si_innerdetno5.ID = null;
+            this.si_innerdetno5.Location = new System.Drawing.Point(100, 594);
+            this.si_innerdetno5.Name = "si_innerdetno5";
+            this.si_innerdetno5.Size = new System.Drawing.Size(157, 21);
+            this.si_innerdetno5.Str = null;
+            this.si_innerdetno5.Str1 = null;
+            this.si_innerdetno5.Str2 = null;
+            this.si_innerdetno5.TabIndex = 147;
+            // 
+            // si_innerdetno5_label
+            // 
+            this.si_innerdetno5_label.AutoSize = true;
+            this.si_innerdetno5_label.BackColor = System.Drawing.Color.Transparent;
+            this.si_innerdetno5_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.si_innerdetno5_label.Location = new System.Drawing.Point(20, 594);
+            this.si_innerdetno5_label.Name = "si_innerdetno5_label";
+            this.si_innerdetno5_label.Size = new System.Drawing.Size(74, 21);
+            this.si_innerdetno5_label.TabIndex = 146;
+            this.si_innerdetno5_label.Text = "同项次序";
+            // 
             // 采集策略
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1082, 634);
+            this.Controls.Add(this.si_innerdetno5);
+            this.Controls.Add(this.si_innerdetno5_label);
+            this.Controls.Add(this.si_innerdetno3);
+            this.Controls.Add(this.si_innerdetno3_label);
+            this.Controls.Add(this.si_innerdetno1);
+            this.Controls.Add(this.si_innerdetno1_label);
+            this.Controls.Add(this.si_innerdetno2);
+            this.Controls.Add(this.si_innerdetno2_label);
+            this.Controls.Add(this.si_innerdetno4);
+            this.Controls.Add(this.si_innerdetno4_label);
             this.Controls.Add(this.si_expressionitem5_label);
             this.Controls.Add(this.si_expressionitem5);
             this.Controls.Add(this.si_id5);
@@ -1535,5 +1675,15 @@
         private CustomControl.EnterTextBox si_expression5;
         private System.Windows.Forms.Label si_expression5_label;
         private System.Windows.Forms.CheckBox si_type5;
+        private CustomControl.EnterTextBox si_innerdetno4;
+        private System.Windows.Forms.Label si_innerdetno4_label;
+        private CustomControl.EnterTextBox si_innerdetno2;
+        private System.Windows.Forms.Label si_innerdetno2_label;
+        private CustomControl.EnterTextBox si_innerdetno1;
+        private System.Windows.Forms.Label si_innerdetno1_label;
+        private CustomControl.EnterTextBox si_innerdetno3;
+        private System.Windows.Forms.Label si_innerdetno3_label;
+        private CustomControl.EnterTextBox si_innerdetno5;
+        private System.Windows.Forms.Label si_innerdetno5_label;
     }
 }

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

@@ -88,7 +88,7 @@ namespace UAS_LabelMachine
                             Enable = 1;
                         }
                         sql.Clear();
-                        sql.Append("update scanitem set si_item='" + Controls["si_item" + i].Text + "',si_detno='" + Controls["si_detno" + i].Text + "',");
+                        sql.Append("update scanitem set si_innerdetno='" + Controls["si_innerdetno" + i].Text + "',si_item='" + Controls["si_item" + i].Text + "',si_detno='" + Controls["si_detno" + i].Text + "',");
                         sql.Append("si_index='" + Controls["si_index" + i].Text + "',si_indexstring='" + Controls["si_indexstring" + i].Text + "',");
                         sql.Append("si_kind='" + Controls["si_kind" + i].Text + "', si_length='" + Controls["si_length" + i].Text + "',si_expressionitem='" + Controls["si_expressionitem" + i].Text + "',");
                         sql.Append("si_expression=:si_expression,si_enable=" + Enable + " where si_id=" + Controls["si_id" + i].Text);
@@ -119,9 +119,9 @@ namespace UAS_LabelMachine
                         }
                         string si_id = dh.GetSEQ("scanitem_seq");
                         sql.Clear();
-                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable) values(" + si_id + "," + sg_id1);
+                        sql.Append("insert into scanitem(si_id,si_sgid,si_detno,si_item,si_kind,si_indexstring,si_index,si_expressionitem,si_expression,si_enable,si_innerdetno) values(" + si_id + "," + sg_id1);
                         sql.Append(",'" + Controls["si_detno" + i].Text + "','" + Controls["si_item" + i].Text + "','" + Controls["si_kind" + i].Text + "',");
-                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ")");
+                        sql.Append("'" + Controls["si_indexstring" + i].Text + "','" + Controls["si_index" + i].Text + "','" + Controls["si_expressionitem" + i].Text + "',:si_expression," + Enable + ",'" + Controls["si_innerdetno" + i].Text + "')");
                         dh.ExecuteSql(sql.ToString(), "insert", new string[] { Controls["si_expression" + i].Text });
                         Controls["si_id" + i].Text = si_id;
                     }
@@ -187,6 +187,7 @@ namespace UAS_LabelMachine
                 Controls["si_index" + i].Enabled = true;
                 Controls["si_indexstring" + i].Enabled = true;
                 Controls["si_length" + i].Enabled = true;
+                Controls["si_innerdetno" + i].Enabled = true;
             }
             else
             {
@@ -198,6 +199,7 @@ namespace UAS_LabelMachine
                 Controls["si_index" + i].Enabled = false;
                 Controls["si_indexstring" + i].Enabled = false;
                 Controls["si_length" + i].Enabled = false;
+                Controls["si_innerdetno" + i].Enabled = false;
             }
         }
 
@@ -231,6 +233,7 @@ namespace UAS_LabelMachine
                                 Controls["si_item" + j].Text = dt.Rows[i]["si_item"].ToString();
                                 Controls["si_kind" + j].Text = dt.Rows[i]["si_kind"].ToString();
                                 Controls["si_length" + j].Text = dt.Rows[i]["si_length"].ToString();
+                                Controls["si_innerdetno" + j].Text = dt.Rows[i]["si_innerdetno"].ToString();
                                 Controls["si_expression" + j].Text = dt.Rows[i]["si_expression"].ToString();
                                 Controls["si_expressionitem" + j].Text = dt.Rows[i]["si_expressionitem"].ToString();
                             }