修改

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     partial class Make_UpdateCollectCode
     {
@@ -30,19 +30,22 @@
         {
             this.collectCodeRules = new System.Windows.Forms.DataGridView();
             this.label1 = new System.Windows.Forms.Label();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.inputValue = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.collects = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.Imei3 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.Imei2 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.Imei1 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.NetCode = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.Bt = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.Mac = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.inputValue = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.psr_type = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.psr_prefix = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.psr_length = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.collects = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.Mac = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
-            this.Bt = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
-            this.NetCode = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
-            this.Imei1 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
-            this.Imei2 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
-            this.Imei3 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).BeginInit();
             this.collects.SuspendLayout();
             this.SuspendLayout();
@@ -54,72 +57,48 @@
             this.psr_type,
             this.psr_prefix,
             this.psr_length});
-            this.collectCodeRules.Location = new System.Drawing.Point(300, 73);
+            this.collectCodeRules.Location = new System.Drawing.Point(279, 70);
             this.collectCodeRules.Name = "collectCodeRules";
             this.collectCodeRules.RowTemplate.Height = 30;
-            this.collectCodeRules.Size = new System.Drawing.Size(733, 287);
+            this.collectCodeRules.Size = new System.Drawing.Size(733, 235);
             this.collectCodeRules.TabIndex = 6;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(297, 27);
+            this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(275, 27);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(80, 18);
+            this.label1.Size = new System.Drawing.Size(106, 24);
             this.label1.TabIndex = 7;
             this.label1.Text = "防呆规则";
             // 
-            // OperateResult
-            // 
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(27, 408);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1006, 228);
-            this.OperateResult.TabIndex = 88;
-            this.OperateResult.Text = "";
-            // 
-            // inputValue
-            // 
-            this.inputValue.AllPower = null;
-            this.inputValue.BackColor = System.Drawing.Color.White;
-            this.inputValue.ID = null;
-            this.inputValue.Location = new System.Drawing.Point(204, 667);
-            this.inputValue.Name = "inputValue";
-            this.inputValue.Power = null;
-            this.inputValue.Size = new System.Drawing.Size(257, 28);
-            this.inputValue.Str = null;
-            this.inputValue.Str1 = null;
-            this.inputValue.Str2 = null;
-            this.inputValue.TabIndex = 90;
-            this.inputValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.inputValue_KeyDown);
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(57, 670);
+            this.label2.Location = new System.Drawing.Point(54, 583);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(62, 18);
             this.label2.TabIndex = 91;
             this.label2.Text = "采集栏";
             // 
-            // psr_type
+            // dataGridViewTextBoxColumn1
             // 
-            this.psr_type.HeaderText = "采集项";
-            this.psr_type.Name = "psr_type";
-            this.psr_type.Width = 230;
+            this.dataGridViewTextBoxColumn1.HeaderText = "采集项";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 230;
             // 
-            // psr_prefix
+            // dataGridViewTextBoxColumn2
             // 
-            this.psr_prefix.HeaderText = "前缀";
-            this.psr_prefix.Name = "psr_prefix";
-            this.psr_prefix.Width = 230;
+            this.dataGridViewTextBoxColumn2.HeaderText = "前缀";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 230;
             // 
-            // psr_length
+            // dataGridViewTextBoxColumn3
             // 
-            this.psr_length.HeaderText = "长度";
-            this.psr_length.Name = "psr_length";
-            this.psr_length.Width = 230;
+            this.dataGridViewTextBoxColumn3.HeaderText = "长度";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 230;
             // 
             // collects
             // 
@@ -130,13 +109,68 @@
             this.collects.Controls.Add(this.NetCode);
             this.collects.Controls.Add(this.Bt);
             this.collects.Controls.Add(this.Mac);
-            this.collects.Location = new System.Drawing.Point(27, 27);
+            this.collects.Location = new System.Drawing.Point(27, 18);
             this.collects.Name = "collects";
-            this.collects.Size = new System.Drawing.Size(188, 333);
+            this.collects.Size = new System.Drawing.Size(185, 287);
             this.collects.TabIndex = 92;
             this.collects.TabStop = false;
             this.collects.TextColor = System.Drawing.Color.Black;
             // 
+            // Imei3
+            // 
+            this.Imei3.AutoSize = true;
+            this.Imei3.Location = new System.Drawing.Point(37, 239);
+            this.Imei3.Name = "Imei3";
+            this.Imei3.Power = null;
+            this.Imei3.Size = new System.Drawing.Size(79, 22);
+            this.Imei3.TabIndex = 5;
+            this.Imei3.Text = "IMEI3";
+            this.Imei3.UseVisualStyleBackColor = true;
+            // 
+            // Imei2
+            // 
+            this.Imei2.AutoSize = true;
+            this.Imei2.Location = new System.Drawing.Point(37, 196);
+            this.Imei2.Name = "Imei2";
+            this.Imei2.Power = null;
+            this.Imei2.Size = new System.Drawing.Size(79, 22);
+            this.Imei2.TabIndex = 4;
+            this.Imei2.Text = "IMEI2";
+            this.Imei2.UseVisualStyleBackColor = true;
+            // 
+            // Imei1
+            // 
+            this.Imei1.AutoSize = true;
+            this.Imei1.Location = new System.Drawing.Point(37, 156);
+            this.Imei1.Name = "Imei1";
+            this.Imei1.Power = null;
+            this.Imei1.Size = new System.Drawing.Size(79, 22);
+            this.Imei1.TabIndex = 3;
+            this.Imei1.Text = "IMEI1";
+            this.Imei1.UseVisualStyleBackColor = true;
+            // 
+            // NetCode
+            // 
+            this.NetCode.AutoSize = true;
+            this.NetCode.Location = new System.Drawing.Point(37, 112);
+            this.NetCode.Name = "NetCode";
+            this.NetCode.Power = null;
+            this.NetCode.Size = new System.Drawing.Size(70, 22);
+            this.NetCode.TabIndex = 2;
+            this.NetCode.Text = "网标";
+            this.NetCode.UseVisualStyleBackColor = true;
+            // 
+            // Bt
+            // 
+            this.Bt.AutoSize = true;
+            this.Bt.Location = new System.Drawing.Point(37, 74);
+            this.Bt.Name = "Bt";
+            this.Bt.Power = null;
+            this.Bt.Size = new System.Drawing.Size(52, 22);
+            this.Bt.TabIndex = 1;
+            this.Bt.Text = "BT";
+            this.Bt.UseVisualStyleBackColor = true;
+            // 
             // Mac
             // 
             this.Mac.AutoSize = true;
@@ -148,66 +182,54 @@
             this.Mac.Text = "MAC/WIFI";
             this.Mac.UseVisualStyleBackColor = true;
             // 
-            // Bt
+            // inputValue
             // 
-            this.Bt.AutoSize = true;
-            this.Bt.Location = new System.Drawing.Point(37, 81);
-            this.Bt.Name = "Bt";
-            this.Bt.Power = null;
-            this.Bt.Size = new System.Drawing.Size(52, 22);
-            this.Bt.TabIndex = 1;
-            this.Bt.Text = "BT";
-            this.Bt.UseVisualStyleBackColor = true;
+            this.inputValue.AllPower = null;
+            this.inputValue.BackColor = System.Drawing.Color.White;
+            this.inputValue.ID = null;
+            this.inputValue.Location = new System.Drawing.Point(195, 573);
+            this.inputValue.Name = "inputValue";
+            this.inputValue.Power = null;
+            this.inputValue.Size = new System.Drawing.Size(257, 28);
+            this.inputValue.Str = null;
+            this.inputValue.Str1 = null;
+            this.inputValue.Str2 = null;
+            this.inputValue.TabIndex = 90;
+            this.inputValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.inputValue_KeyDown);
             // 
-            // NetCode
+            // OperateResult
             // 
-            this.NetCode.AutoSize = true;
-            this.NetCode.Location = new System.Drawing.Point(38, 129);
-            this.NetCode.Name = "NetCode";
-            this.NetCode.Power = null;
-            this.NetCode.Size = new System.Drawing.Size(70, 22);
-            this.NetCode.TabIndex = 2;
-            this.NetCode.Text = "网标";
-            this.NetCode.UseVisualStyleBackColor = true;
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(27, 327);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1006, 228);
+            this.OperateResult.TabIndex = 88;
+            this.OperateResult.Text = "";
             // 
-            // Imei1
+            // psr_type
             // 
-            this.Imei1.AutoSize = true;
-            this.Imei1.Location = new System.Drawing.Point(38, 185);
-            this.Imei1.Name = "Imei1";
-            this.Imei1.Power = null;
-            this.Imei1.Size = new System.Drawing.Size(79, 22);
-            this.Imei1.TabIndex = 3;
-            this.Imei1.Text = "IMEI1";
-            this.Imei1.UseVisualStyleBackColor = true;
+            this.psr_type.HeaderText = "采集项";
+            this.psr_type.Name = "psr_type";
+            this.psr_type.Width = 150;
             // 
-            // Imei2
+            // psr_prefix
             // 
-            this.Imei2.AutoSize = true;
-            this.Imei2.Location = new System.Drawing.Point(37, 232);
-            this.Imei2.Name = "Imei2";
-            this.Imei2.Power = null;
-            this.Imei2.Size = new System.Drawing.Size(79, 22);
-            this.Imei2.TabIndex = 4;
-            this.Imei2.Text = "IMEI2";
-            this.Imei2.UseVisualStyleBackColor = true;
+            this.psr_prefix.HeaderText = "前缀";
+            this.psr_prefix.Name = "psr_prefix";
+            this.psr_prefix.Width = 150;
             // 
-            // Imei3
+            // psr_length
             // 
-            this.Imei3.AutoSize = true;
-            this.Imei3.Location = new System.Drawing.Point(37, 283);
-            this.Imei3.Name = "Imei3";
-            this.Imei3.Power = null;
-            this.Imei3.Size = new System.Drawing.Size(79, 22);
-            this.Imei3.TabIndex = 5;
-            this.Imei3.Text = "IMEI3";
-            this.Imei3.UseVisualStyleBackColor = true;
+            this.psr_length.HeaderText = "长度";
+            this.psr_length.Name = "psr_length";
+            this.psr_length.Width = 150;
             // 
             // Make_UpdateCollectCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1120, 724);
+            this.ClientSize = new System.Drawing.Size(1120, 614);
             this.Controls.Add(this.collects);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.inputValue);
@@ -221,9 +243,9 @@
             this.Load += new System.EventHandler(this.Make_UpdateCollectCode_Load);
             this.SizeChanged += new System.EventHandler(this.Make_UpdateCollectCode_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).EndInit();
-            this.collects.ResumeLayout(false);
+            this.collects.ResumeLayout(true);
             this.collects.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -234,9 +256,6 @@
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.TextBoxWithIcon.EnterTextBox inputValue;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psr_type;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psr_prefix;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psr_length;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder collects;
         private CustomControl.CustomCheckBox.CustomCheckBox Imei3;
         private CustomControl.CustomCheckBox.CustomCheckBox Imei2;
@@ -244,5 +263,11 @@
         private CustomControl.CustomCheckBox.CustomCheckBox NetCode;
         private CustomControl.CustomCheckBox.CustomCheckBox Bt;
         private CustomControl.CustomCheckBox.CustomCheckBox Mac;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psr_type;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psr_prefix;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psr_length;
     }
 }

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.cs

@@ -11,7 +11,7 @@ using UAS_MES.DataOperate;
 using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     public partial class Make_UpdateCollectCode : Form
     {