修改

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

@@ -40,12 +40,12 @@
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = 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.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();
             this.inputValue = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).BeginInit();
@@ -154,38 +154,29 @@
             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 = 0;
-            this.Imei3.Text = "IMEI3";
-            this.Imei3.UseVisualStyleBackColor = true;
-            // 
-            // Imei2
+            // Mac
             // 
-            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 = 1;
-            this.Imei2.Text = "IMEI2";
-            this.Imei2.UseVisualStyleBackColor = true;
+            this.Mac.AutoSize = true;
+            this.Mac.Location = new System.Drawing.Point(37, 31);
+            this.Mac.Name = "Mac";
+            this.Mac.Power = null;
+            this.Mac.Size = new System.Drawing.Size(106, 22);
+            this.Mac.TabIndex = 5;
+            this.Mac.Text = "MAC/WIFI";
+            this.Mac.UseVisualStyleBackColor = true;
+            this.Mac.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
             // 
-            // Imei1
+            // Bt
             // 
-            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 = 2;
-            this.Imei1.Text = "IMEI1";
-            this.Imei1.UseVisualStyleBackColor = true;
+            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 = 4;
+            this.Bt.Text = "BT";
+            this.Bt.UseVisualStyleBackColor = true;
+            this.Bt.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
             // 
             // NetCode
             // 
@@ -197,28 +188,43 @@
             this.NetCode.TabIndex = 3;
             this.NetCode.Text = "网标";
             this.NetCode.UseVisualStyleBackColor = true;
+            this.NetCode.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
             // 
-            // Bt
+            // Imei1
             // 
-            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 = 4;
-            this.Bt.Text = "BT";
-            this.Bt.UseVisualStyleBackColor = true;
+            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 = 2;
+            this.Imei1.Text = "IMEI1";
+            this.Imei1.UseVisualStyleBackColor = true;
+            this.Imei1.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
             // 
-            // Mac
+            // Imei2
             // 
-            this.Mac.AutoSize = true;
-            this.Mac.Location = new System.Drawing.Point(37, 31);
-            this.Mac.Name = "Mac";
-            this.Mac.Power = null;
-            this.Mac.Size = new System.Drawing.Size(106, 22);
-            this.Mac.TabIndex = 5;
-            this.Mac.Text = "MAC/WIFI";
-            this.Mac.UseVisualStyleBackColor = true;
+            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 = 1;
+            this.Imei2.Text = "IMEI2";
+            this.Imei2.UseVisualStyleBackColor = true;
+            this.Imei2.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
+            // 
+            // 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 = 0;
+            this.Imei3.Text = "IMEI3";
+            this.Imei3.UseVisualStyleBackColor = true;
+            this.Imei3.CheckedChanged += new System.EventHandler(this.Mac_CheckedChanged);
             // 
             // inputValue
             // 

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.cs

@@ -261,5 +261,21 @@ namespace UAS_MES.Make
             }
             return true;
         }
+
+        private void Mac_CheckedChanged(object sender, EventArgs e)
+        {
+            //当有checkBox状态改变的时候
+            if (step!=0)
+            {
+                //步骤码归零
+                step = 0;
+                //清除list,信息栏
+                list.Clear();
+                BaseUtil.CleanDataTableData(info);
+                //聚焦，提示
+                inputValue.Focus();
+                OperateResult.AppendText(">>请采集SN\n", Color.Black);
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.resx

@@ -129,16 +129,4 @@
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="psr_type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psr_prefix.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="psr_length.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>