读取测试文件LOG信息完善

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -42,20 +42,26 @@ namespace UAS_MES_NEW.Make
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.CheckItemDGV = new System.Windows.Forms.DataGridView();
-            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_testtimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label6 = new System.Windows.Forms.Label();
+            this.WatchPath = new System.Windows.Forms.TextBox();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ReSet = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
+            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_sn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_bt = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_imei1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_imei2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.label6 = new System.Windows.Forms.Label();
-            this.WatchPath = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.CheckItemDGV)).BeginInit();
             this.SuspendLayout();
             // 
@@ -181,9 +187,12 @@ namespace UAS_MES_NEW.Make
             this.CheckItemDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.CheckItemDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.std_class,
-            this.std_testtimes,
             this.std_testresult,
-            this.std_badcode});
+            this.std_sn,
+            this.std_mac,
+            this.std_bt,
+            this.std_imei1,
+            this.std_imei2});
             this.CheckItemDGV.Location = new System.Drawing.Point(57, 199);
             this.CheckItemDGV.Name = "CheckItemDGV";
             this.CheckItemDGV.RowTemplate.Height = 37;
@@ -191,40 +200,24 @@ namespace UAS_MES_NEW.Make
             this.CheckItemDGV.TabIndex = 33;
             this.CheckItemDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.CheckItemDGV_CellPainting);
             // 
-            // std_class
-            // 
-            this.std_class.DataPropertyName = "std_class";
-            this.std_class.HeaderText = "检测项";
-            this.std_class.MinimumWidth = 130;
-            this.std_class.Name = "std_class";
-            this.std_class.ReadOnly = true;
-            this.std_class.Width = 150;
-            // 
-            // std_testtimes
-            // 
-            this.std_testtimes.DataPropertyName = "std_testtimes";
-            this.std_testtimes.HeaderText = "测试次数";
-            this.std_testtimes.MinimumWidth = 200;
-            this.std_testtimes.Name = "std_testtimes";
-            this.std_testtimes.ReadOnly = true;
-            this.std_testtimes.Width = 468;
-            // 
-            // std_testresult
+            // label6
             // 
-            this.std_testresult.DataPropertyName = "std_testresult";
-            this.std_testresult.HeaderText = "测试结果";
-            this.std_testresult.MinimumWidth = 200;
-            this.std_testresult.Name = "std_testresult";
-            this.std_testresult.ReadOnly = true;
-            this.std_testresult.Width = 467;
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label6.Location = new System.Drawing.Point(1197, 781);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(146, 41);
+            this.label6.TabIndex = 37;
+            this.label6.Text = "监控路径";
             // 
-            // std_badcode
+            // WatchPath
             // 
-            this.std_badcode.DataPropertyName = "std_badcode";
-            this.std_badcode.HeaderText = "故障代码";
-            this.std_badcode.MinimumWidth = 200;
-            this.std_badcode.Name = "std_badcode";
-            this.std_badcode.Width = 200;
+            this.WatchPath.Location = new System.Drawing.Point(1367, 785);
+            this.WatchPath.Name = "WatchPath";
+            this.WatchPath.Size = new System.Drawing.Size(258, 35);
+            this.WatchPath.TabIndex = 36;
+            this.WatchPath.Text = "/storage/emulated/0/elink/";
             // 
             // dataGridViewTextBoxColumn1
             // 
@@ -261,6 +254,28 @@ namespace UAS_MES_NEW.Make
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.Width = 200;
             // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "std_bt";
+            this.dataGridViewTextBoxColumn5.HeaderText = "BT";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 100;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "std_imei1";
+            this.dataGridViewTextBoxColumn6.HeaderText = "IMEI1";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 100;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "std_imei2";
+            this.dataGridViewTextBoxColumn7.HeaderText = "IMEI2";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 100;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            // 
             // ReSet
             // 
             this.ReSet.AutoSize = true;
@@ -271,6 +286,63 @@ namespace UAS_MES_NEW.Make
             this.ReSet.Text = "恢复出厂设置";
             this.ReSet.UseVisualStyleBackColor = true;
             // 
+            // std_class
+            // 
+            this.std_class.DataPropertyName = "std_class";
+            this.std_class.HeaderText = "检测项";
+            this.std_class.MinimumWidth = 140;
+            this.std_class.Name = "std_class";
+            this.std_class.ReadOnly = true;
+            this.std_class.Width = 150;
+            // 
+            // std_testresult
+            // 
+            this.std_testresult.DataPropertyName = "std_testresult";
+            this.std_testresult.HeaderText = "测试结果";
+            this.std_testresult.MinimumWidth = 150;
+            this.std_testresult.Name = "std_testresult";
+            this.std_testresult.ReadOnly = true;
+            this.std_testresult.Width = 150;
+            // 
+            // std_sn
+            // 
+            this.std_sn.DataPropertyName = "std_sn";
+            this.std_sn.HeaderText = "SN";
+            this.std_sn.MinimumWidth = 100;
+            this.std_sn.Name = "std_sn";
+            this.std_sn.ReadOnly = true;
+            this.std_sn.Width = 200;
+            // 
+            // std_mac
+            // 
+            this.std_mac.DataPropertyName = "std_mac";
+            this.std_mac.HeaderText = "MAC";
+            this.std_mac.MinimumWidth = 100;
+            this.std_mac.Name = "std_mac";
+            this.std_mac.Width = 200;
+            // 
+            // std_bt
+            // 
+            this.std_bt.DataPropertyName = "std_bt";
+            this.std_bt.HeaderText = "BT";
+            this.std_bt.MinimumWidth = 100;
+            this.std_bt.Name = "std_bt";
+            this.std_bt.Width = 200;
+            // 
+            // std_imei1
+            // 
+            this.std_imei1.DataPropertyName = "std_imei1";
+            this.std_imei1.HeaderText = "IMEI1";
+            this.std_imei1.MinimumWidth = 100;
+            this.std_imei1.Name = "std_imei1";
+            // 
+            // std_imei2
+            // 
+            this.std_imei2.DataPropertyName = "std_imei2";
+            this.std_imei2.HeaderText = "IMEI2";
+            this.std_imei2.MinimumWidth = 100;
+            this.std_imei2.Name = "std_imei2";
+            // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
@@ -301,32 +373,13 @@ namespace UAS_MES_NEW.Make
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1265, 199);
+            this.OperateResult.Location = new System.Drawing.Point(1204, 199);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(454, 562);
+            this.OperateResult.Size = new System.Drawing.Size(538, 562);
             this.OperateResult.TabIndex = 27;
             this.OperateResult.Text = "";
             // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label6.Location = new System.Drawing.Point(1261, 783);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(146, 41);
-            this.label6.TabIndex = 37;
-            this.label6.Text = "监控路径";
-            // 
-            // WatchPath
-            // 
-            this.WatchPath.Location = new System.Drawing.Point(1431, 787);
-            this.WatchPath.Name = "WatchPath";
-            this.WatchPath.Size = new System.Drawing.Size(258, 35);
-            this.WatchPath.TabIndex = 36;
-            this.WatchPath.Text = "/storage/emulated/0/elink/";
-            // 
             // Make_GetTestFileData
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
@@ -381,13 +434,19 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_class;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_testtimes;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_testresult;
-        private System.Windows.Forms.DataGridViewTextBoxColumn std_badcode;
         private ReSetCheckBox ReSet;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.TextBox WatchPath;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_class;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_testresult;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_sn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_mac;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_bt;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_imei1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn std_imei2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
     }
 }

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.cs

@@ -78,14 +78,12 @@ namespace UAS_MES_NEW.Make
                         dt.Rows.RemoveAt(0);
                         //设置列名绑定数据
                         dt.Columns[0].ColumnName = "std_class";
-                        //dt.Columns[1].ColumnName = "std_testtimes";
                         dt.Columns[1].ColumnName = "std_testresult";
                         dt.Columns[2].ColumnName = "std_sn";
                         dt.Columns[3].ColumnName = "std_mac";
                         dt.Columns[4].ColumnName = "std_bt";
                         dt.Columns[5].ColumnName = "std_imei1";
                         dt.Columns[6].ColumnName = "std_imei2";
-                        //dt.Columns[3].ColumnName = "std_badcode";
                         CheckItemDGV.DataSource = dt;
                         bool Result = true;
                         string MAC = "";
@@ -126,7 +124,7 @@ namespace UAS_MES_NEW.Make
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
                                 //SN核对成功
                                 //>> 请输入SN
-                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
+                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN + "\n", Color.Green, sncode);
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 SetCheck set = new SetCheck("OK", Color.Green);
                                 BaseUtil.SetFormCenter(set);

UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.resx

@@ -120,13 +120,43 @@
   <metadata name="std_class.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="std_testtimes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_testresult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_sn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_bt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_imei1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_imei2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_class.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="std_testresult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="std_badcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="std_sn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_mac.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_bt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_imei1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="std_imei2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>