fix

UAS_MES_HYSX/FunctionCode/Make/Make_AirTightnessTest.Designer.cs

@@ -30,6 +30,7 @@
         {
             this.panel1 = new System.Windows.Forms.Panel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.RTxt10 = new System.Windows.Forms.Label();
             this.LTxt10 = new System.Windows.Forms.Label();
@@ -51,7 +52,6 @@
             this.LTxt1 = new System.Windows.Forms.Label();
             this.RTxt7 = new System.Windows.Forms.Label();
             this.RTxt8 = new System.Windows.Forms.TextBox();
-            this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.ProtDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ClearMsg = new System.Windows.Forms.Button();
             this.Result = new System.Windows.Forms.TextBox();
@@ -76,12 +76,41 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = new System.Windows.Forms.Label();
+            this.Pagination = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
+            this.R1Txt10 = new System.Windows.Forms.Label();
+            this.L1Txt10 = new System.Windows.Forms.Label();
+            this.R1Txt9 = new System.Windows.Forms.Label();
+            this.L1Txt9 = new System.Windows.Forms.Label();
+            this.L1Txt8 = new System.Windows.Forms.Label();
+            this.L1Txt7 = new System.Windows.Forms.Label();
+            this.R1Txt6 = new System.Windows.Forms.Label();
+            this.L1Txt6 = new System.Windows.Forms.Label();
+            this.R1Txt5 = new System.Windows.Forms.Label();
+            this.L1Txt5 = new System.Windows.Forms.Label();
+            this.R1Txt4 = new System.Windows.Forms.Label();
+            this.L1Txt4 = new System.Windows.Forms.Label();
+            this.R1Txt3 = new System.Windows.Forms.Label();
+            this.L1Txt3 = new System.Windows.Forms.Label();
+            this.R1Txt2 = new System.Windows.Forms.Label();
+            this.L1Txt2 = new System.Windows.Forms.Label();
+            this.R1Txt1 = new System.Windows.Forms.Label();
+            this.L1Txt1 = new System.Windows.Forms.Label();
+            this.R1Txt7 = new System.Windows.Forms.Label();
+            this.R1Txt8 = new System.Windows.Forms.TextBox();
+            this.Result1 = new System.Windows.Forms.TextBox();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
             this.ProtDetails.SuspendLayout();
             this.SNDetails.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            this.Pagination.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tableLayoutPanel4.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel1
@@ -91,7 +120,7 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(5, 128);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1356, 635);
+            this.panel1.Size = new System.Drawing.Size(1590, 767);
             this.panel1.TabIndex = 132;
             // 
             // tableLayoutPanel2
@@ -99,18 +128,30 @@
             this.tableLayoutPanel2.ColumnCount = 2;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 65F));
+            this.tableLayoutPanel2.Controls.Add(this.Pagination, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.OperatResult, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 333);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 1;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(1356, 302);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(1590, 434);
             this.tableLayoutPanel2.TabIndex = 3;
             // 
+            // OperatResult
+            // 
+            this.OperatResult.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperatResult.Location = new System.Drawing.Point(560, 4);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(1026, 426);
+            this.OperatResult.TabIndex = 88;
+            this.OperatResult.Text = "";
+            // 
             // tableLayoutPanel3
             // 
+            this.tableLayoutPanel3.BackColor = System.Drawing.SystemColors.Control;
             this.tableLayoutPanel3.ColumnCount = 4;
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18F));
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
@@ -145,7 +186,8 @@
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(468, 296);
+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(536, 381);
             this.tableLayoutPanel3.TabIndex = 89;
             // 
             // RTxt10
@@ -153,9 +195,9 @@
             this.RTxt10.AutoSize = true;
             this.RTxt10.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt10.Location = new System.Drawing.Point(329, 236);
+            this.RTxt10.Location = new System.Drawing.Point(376, 304);
             this.RTxt10.Name = "RTxt10";
-            this.RTxt10.Size = new System.Drawing.Size(136, 60);
+            this.RTxt10.Size = new System.Drawing.Size(157, 77);
             this.RTxt10.TabIndex = 19;
             this.RTxt10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -164,9 +206,9 @@
             this.LTxt10.AutoSize = true;
             this.LTxt10.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt10.Location = new System.Drawing.Point(227, 236);
+            this.LTxt10.Location = new System.Drawing.Point(259, 304);
             this.LTxt10.Name = "LTxt10";
-            this.LTxt10.Size = new System.Drawing.Size(96, 60);
+            this.LTxt10.Size = new System.Drawing.Size(111, 77);
             this.LTxt10.TabIndex = 18;
             this.LTxt10.Text = "传输结果:";
             this.LTxt10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -176,9 +218,9 @@
             this.RTxt9.AutoSize = true;
             this.RTxt9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt9.Location = new System.Drawing.Point(87, 236);
+            this.RTxt9.Location = new System.Drawing.Point(99, 304);
             this.RTxt9.Name = "RTxt9";
-            this.RTxt9.Size = new System.Drawing.Size(134, 60);
+            this.RTxt9.Size = new System.Drawing.Size(154, 77);
             this.RTxt9.TabIndex = 17;
             this.RTxt9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -187,9 +229,9 @@
             this.LTxt9.AutoSize = true;
             this.LTxt9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt9.Location = new System.Drawing.Point(3, 236);
+            this.LTxt9.Location = new System.Drawing.Point(3, 304);
             this.LTxt9.Name = "LTxt9";
-            this.LTxt9.Size = new System.Drawing.Size(78, 60);
+            this.LTxt9.Size = new System.Drawing.Size(90, 77);
             this.LTxt9.TabIndex = 16;
             this.LTxt9.Text = "测试结果:";
             this.LTxt9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -199,9 +241,9 @@
             this.LTxt8.AutoSize = true;
             this.LTxt8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt8.Location = new System.Drawing.Point(227, 177);
+            this.LTxt8.Location = new System.Drawing.Point(259, 228);
             this.LTxt8.Name = "LTxt8";
-            this.LTxt8.Size = new System.Drawing.Size(96, 59);
+            this.LTxt8.Size = new System.Drawing.Size(111, 76);
             this.LTxt8.TabIndex = 14;
             this.LTxt8.Text = "泄露值:";
             this.LTxt8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -211,9 +253,9 @@
             this.LTxt7.AutoSize = true;
             this.LTxt7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt7.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt7.Location = new System.Drawing.Point(3, 177);
+            this.LTxt7.Location = new System.Drawing.Point(3, 228);
             this.LTxt7.Name = "LTxt7";
-            this.LTxt7.Size = new System.Drawing.Size(78, 59);
+            this.LTxt7.Size = new System.Drawing.Size(90, 76);
             this.LTxt7.TabIndex = 12;
             this.LTxt7.Text = "压力值:";
             this.LTxt7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -223,9 +265,9 @@
             this.RTxt6.AutoSize = true;
             this.RTxt6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt6.Location = new System.Drawing.Point(329, 118);
+            this.RTxt6.Location = new System.Drawing.Point(376, 152);
             this.RTxt6.Name = "RTxt6";
-            this.RTxt6.Size = new System.Drawing.Size(136, 59);
+            this.RTxt6.Size = new System.Drawing.Size(157, 76);
             this.RTxt6.TabIndex = 11;
             this.RTxt6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -234,9 +276,9 @@
             this.LTxt6.AutoSize = true;
             this.LTxt6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt6.Location = new System.Drawing.Point(227, 118);
+            this.LTxt6.Location = new System.Drawing.Point(259, 152);
             this.LTxt6.Name = "LTxt6";
-            this.LTxt6.Size = new System.Drawing.Size(96, 59);
+            this.LTxt6.Size = new System.Drawing.Size(111, 76);
             this.LTxt6.TabIndex = 10;
             this.LTxt6.Text = "测试时间:";
             this.LTxt6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -246,9 +288,9 @@
             this.RTxt5.AutoSize = true;
             this.RTxt5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt5.Location = new System.Drawing.Point(87, 118);
+            this.RTxt5.Location = new System.Drawing.Point(99, 152);
             this.RTxt5.Name = "RTxt5";
-            this.RTxt5.Size = new System.Drawing.Size(134, 59);
+            this.RTxt5.Size = new System.Drawing.Size(154, 76);
             this.RTxt5.TabIndex = 9;
             this.RTxt5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -257,9 +299,9 @@
             this.LTxt5.AutoSize = true;
             this.LTxt5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt5.Location = new System.Drawing.Point(3, 118);
+            this.LTxt5.Location = new System.Drawing.Point(3, 152);
             this.LTxt5.Name = "LTxt5";
-            this.LTxt5.Size = new System.Drawing.Size(78, 59);
+            this.LTxt5.Size = new System.Drawing.Size(90, 76);
             this.LTxt5.TabIndex = 8;
             this.LTxt5.Text = "稳压时间:";
             this.LTxt5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -269,9 +311,9 @@
             this.RTxt4.AutoSize = true;
             this.RTxt4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt4.Location = new System.Drawing.Point(329, 59);
+            this.RTxt4.Location = new System.Drawing.Point(376, 76);
             this.RTxt4.Name = "RTxt4";
-            this.RTxt4.Size = new System.Drawing.Size(136, 59);
+            this.RTxt4.Size = new System.Drawing.Size(157, 76);
             this.RTxt4.TabIndex = 7;
             this.RTxt4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -280,9 +322,9 @@
             this.LTxt4.AutoSize = true;
             this.LTxt4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt4.Location = new System.Drawing.Point(227, 59);
+            this.LTxt4.Location = new System.Drawing.Point(259, 76);
             this.LTxt4.Name = "LTxt4";
-            this.LTxt4.Size = new System.Drawing.Size(96, 59);
+            this.LTxt4.Size = new System.Drawing.Size(111, 76);
             this.LTxt4.TabIndex = 6;
             this.LTxt4.Text = "充气时间:";
             this.LTxt4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -292,9 +334,9 @@
             this.RTxt3.AutoSize = true;
             this.RTxt3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt3.Location = new System.Drawing.Point(87, 59);
+            this.RTxt3.Location = new System.Drawing.Point(99, 76);
             this.RTxt3.Name = "RTxt3";
-            this.RTxt3.Size = new System.Drawing.Size(134, 59);
+            this.RTxt3.Size = new System.Drawing.Size(154, 76);
             this.RTxt3.TabIndex = 5;
             this.RTxt3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -303,9 +345,9 @@
             this.LTxt3.AutoSize = true;
             this.LTxt3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt3.Location = new System.Drawing.Point(3, 59);
+            this.LTxt3.Location = new System.Drawing.Point(3, 76);
             this.LTxt3.Name = "LTxt3";
-            this.LTxt3.Size = new System.Drawing.Size(78, 59);
+            this.LTxt3.Size = new System.Drawing.Size(90, 76);
             this.LTxt3.TabIndex = 4;
             this.LTxt3.Text = "工位号:";
             this.LTxt3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -315,9 +357,9 @@
             this.RTxt2.AutoSize = true;
             this.RTxt2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt2.Location = new System.Drawing.Point(329, 0);
+            this.RTxt2.Location = new System.Drawing.Point(376, 0);
             this.RTxt2.Name = "RTxt2";
-            this.RTxt2.Size = new System.Drawing.Size(136, 59);
+            this.RTxt2.Size = new System.Drawing.Size(157, 76);
             this.RTxt2.TabIndex = 3;
             this.RTxt2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -326,9 +368,9 @@
             this.LTxt2.AutoSize = true;
             this.LTxt2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.LTxt2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.LTxt2.Location = new System.Drawing.Point(227, 0);
+            this.LTxt2.Location = new System.Drawing.Point(259, 0);
             this.LTxt2.Name = "LTxt2";
-            this.LTxt2.Size = new System.Drawing.Size(96, 59);
+            this.LTxt2.Size = new System.Drawing.Size(111, 76);
             this.LTxt2.TabIndex = 2;
             this.LTxt2.Text = "发送开始信息:";
             this.LTxt2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -338,9 +380,9 @@
             this.RTxt1.AutoSize = true;
             this.RTxt1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt1.Location = new System.Drawing.Point(87, 0);
+            this.RTxt1.Location = new System.Drawing.Point(99, 0);
             this.RTxt1.Name = "RTxt1";
-            this.RTxt1.Size = new System.Drawing.Size(134, 59);
+            this.RTxt1.Size = new System.Drawing.Size(154, 76);
             this.RTxt1.TabIndex = 1;
             this.RTxt1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -351,7 +393,7 @@
             this.LTxt1.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.LTxt1.Location = new System.Drawing.Point(3, 0);
             this.LTxt1.Name = "LTxt1";
-            this.LTxt1.Size = new System.Drawing.Size(78, 59);
+            this.LTxt1.Size = new System.Drawing.Size(90, 76);
             this.LTxt1.TabIndex = 0;
             this.LTxt1.Text = "日期时间:";
             this.LTxt1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -361,9 +403,9 @@
             this.RTxt7.AutoSize = true;
             this.RTxt7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RTxt7.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt7.Location = new System.Drawing.Point(87, 177);
+            this.RTxt7.Location = new System.Drawing.Point(99, 228);
             this.RTxt7.Name = "RTxt7";
-            this.RTxt7.Size = new System.Drawing.Size(134, 59);
+            this.RTxt7.Size = new System.Drawing.Size(154, 76);
             this.RTxt7.TabIndex = 15;
             this.RTxt7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -373,26 +415,16 @@
             this.RTxt8.BackColor = System.Drawing.SystemColors.Control;
             this.RTxt8.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.RTxt8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.RTxt8.Location = new System.Drawing.Point(329, 190);
+            this.RTxt8.Location = new System.Drawing.Point(376, 250);
             this.RTxt8.Name = "RTxt8";
             this.RTxt8.Size = new System.Drawing.Size(136, 32);
             this.RTxt8.TabIndex = 13;
             this.RTxt8.KeyDown += new System.Windows.Forms.KeyEventHandler(this.RTxt8_KeyDown);
             // 
-            // OperatResult
-            // 
-            this.OperatResult.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(478, 4);
-            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
-            this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(874, 294);
-            this.OperatResult.TabIndex = 88;
-            this.OperatResult.Text = "";
-            // 
             // ProtDetails
             // 
             this.ProtDetails.BorderColor = System.Drawing.Color.Black;
+            this.ProtDetails.Controls.Add(this.Result1);
             this.ProtDetails.Controls.Add(this.ClearMsg);
             this.ProtDetails.Controls.Add(this.Result);
             this.ProtDetails.Controls.Add(this.label10);
@@ -410,7 +442,7 @@
             this.ProtDetails.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.ProtDetails.Location = new System.Drawing.Point(0, 0);
             this.ProtDetails.Name = "ProtDetails";
-            this.ProtDetails.Size = new System.Drawing.Size(1356, 333);
+            this.ProtDetails.Size = new System.Drawing.Size(1590, 333);
             this.ProtDetails.TabIndex = 2;
             this.ProtDetails.TabStop = false;
             this.ProtDetails.Text = "端口设置";
@@ -419,7 +451,7 @@
             // ClearMsg
             // 
             this.ClearMsg.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.ClearMsg.Location = new System.Drawing.Point(887, 262);
+            this.ClearMsg.Location = new System.Drawing.Point(1442, 284);
             this.ClearMsg.Name = "ClearMsg";
             this.ClearMsg.Size = new System.Drawing.Size(142, 39);
             this.ClearMsg.TabIndex = 13;
@@ -429,7 +461,7 @@
             // 
             // Result
             // 
-            this.Result.Location = new System.Drawing.Point(179, 264);
+            this.Result.Location = new System.Drawing.Point(178, 239);
             this.Result.Name = "Result";
             this.Result.Size = new System.Drawing.Size(680, 39);
             this.Result.TabIndex = 12;
@@ -437,7 +469,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(69, 267);
+            this.label10.Location = new System.Drawing.Point(68, 242);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(110, 31);
             this.label10.TabIndex = 11;
@@ -547,7 +579,7 @@
             this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.SNDetails.Location = new System.Drawing.Point(5, 5);
             this.SNDetails.Name = "SNDetails";
-            this.SNDetails.Size = new System.Drawing.Size(1356, 123);
+            this.SNDetails.Size = new System.Drawing.Size(1590, 123);
             this.SNDetails.TabIndex = 1;
             this.SNDetails.TabStop = false;
             this.SNDetails.Text = "产品序列信息";
@@ -577,16 +609,16 @@
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 1;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1350, 83);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1584, 83);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // productName
             // 
             this.productName.AutoSize = true;
             this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(855, 0);
+            this.productName.Location = new System.Drawing.Point(1001, 0);
             this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(492, 83);
+            this.productName.Size = new System.Drawing.Size(580, 83);
             this.productName.TabIndex = 7;
             this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -594,9 +626,9 @@
             // 
             this.productCode.AutoSize = true;
             this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(590, 0);
+            this.productCode.Location = new System.Drawing.Point(691, 0);
             this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(172, 83);
+            this.productCode.Size = new System.Drawing.Size(202, 83);
             this.productCode.TabIndex = 6;
             this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -604,9 +636,9 @@
             // 
             this.workOrder.AutoSize = true;
             this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(340, 0);
+            this.workOrder.Location = new System.Drawing.Point(398, 0);
             this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(157, 83);
+            this.workOrder.Size = new System.Drawing.Size(185, 83);
             this.workOrder.TabIndex = 5;
             this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -614,9 +646,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(768, 0);
+            this.label4.Location = new System.Drawing.Point(899, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(81, 83);
+            this.label4.Size = new System.Drawing.Size(96, 83);
             this.label4.TabIndex = 3;
             this.label4.Text = "产品名称: ";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -627,7 +659,7 @@
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Location = new System.Drawing.Point(3, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(81, 83);
+            this.label1.Size = new System.Drawing.Size(96, 83);
             this.label1.TabIndex = 0;
             this.label1.Text = "序列号: ";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -636,9 +668,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(503, 0);
+            this.label3.Location = new System.Drawing.Point(589, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(81, 83);
+            this.label3.Size = new System.Drawing.Size(96, 83);
             this.label3.TabIndex = 2;
             this.label3.Text = "产品编号: ";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -647,9 +679,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(253, 0);
+            this.label2.Location = new System.Drawing.Point(296, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(81, 83);
+            this.label2.Size = new System.Drawing.Size(96, 83);
             this.label2.TabIndex = 1;
             this.label2.Text = "工单: ";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -658,17 +690,329 @@
             // 
             this.serialNumber.AutoSize = true;
             this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(90, 0);
+            this.serialNumber.Location = new System.Drawing.Point(105, 0);
             this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(157, 83);
+            this.serialNumber.Size = new System.Drawing.Size(185, 83);
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // Pagination
+            // 
+            this.Pagination.Controls.Add(this.tabPage1);
+            this.Pagination.Controls.Add(this.tabPage2);
+            this.Pagination.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Pagination.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Pagination.Location = new System.Drawing.Point(3, 3);
+            this.Pagination.Name = "Pagination";
+            this.Pagination.SelectedIndex = 0;
+            this.Pagination.Size = new System.Drawing.Size(550, 428);
+            this.Pagination.TabIndex = 14;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.tableLayoutPanel3);
+            this.tabPage1.Location = new System.Drawing.Point(4, 37);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(542, 387);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "1#工位";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.tableLayoutPanel4);
+            this.tabPage2.Location = new System.Drawing.Point(4, 37);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(542, 387);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "2#工位";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // tableLayoutPanel4
+            // 
+            this.tableLayoutPanel4.BackColor = System.Drawing.SystemColors.Control;
+            this.tableLayoutPanel4.ColumnCount = 4;
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt10, 3, 4);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt10, 2, 4);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt9, 1, 4);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt9, 0, 4);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt8, 2, 3);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt7, 0, 3);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt6, 3, 2);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt6, 2, 2);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt5, 1, 2);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt5, 0, 2);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt4, 3, 1);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt4, 2, 1);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt3, 1, 1);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt3, 0, 1);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt2, 3, 0);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt2, 2, 0);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt1, 1, 0);
+            this.tableLayoutPanel4.Controls.Add(this.L1Txt1, 0, 0);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt7, 1, 3);
+            this.tableLayoutPanel4.Controls.Add(this.R1Txt8, 3, 3);
+            this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 3);
+            this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+            this.tableLayoutPanel4.RowCount = 5;
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(536, 381);
+            this.tableLayoutPanel4.TabIndex = 90;
+            // 
+            // R1Txt10
+            // 
+            this.R1Txt10.AutoSize = true;
+            this.R1Txt10.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt10.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt10.Location = new System.Drawing.Point(376, 304);
+            this.R1Txt10.Name = "R1Txt10";
+            this.R1Txt10.Size = new System.Drawing.Size(157, 77);
+            this.R1Txt10.TabIndex = 19;
+            this.R1Txt10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt10
+            // 
+            this.L1Txt10.AutoSize = true;
+            this.L1Txt10.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt10.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt10.Location = new System.Drawing.Point(259, 304);
+            this.L1Txt10.Name = "L1Txt10";
+            this.L1Txt10.Size = new System.Drawing.Size(111, 77);
+            this.L1Txt10.TabIndex = 18;
+            this.L1Txt10.Text = "传输结果:";
+            this.L1Txt10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt9
+            // 
+            this.R1Txt9.AutoSize = true;
+            this.R1Txt9.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt9.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt9.Location = new System.Drawing.Point(99, 304);
+            this.R1Txt9.Name = "R1Txt9";
+            this.R1Txt9.Size = new System.Drawing.Size(154, 77);
+            this.R1Txt9.TabIndex = 17;
+            this.R1Txt9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt9
+            // 
+            this.L1Txt9.AutoSize = true;
+            this.L1Txt9.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt9.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt9.Location = new System.Drawing.Point(3, 304);
+            this.L1Txt9.Name = "L1Txt9";
+            this.L1Txt9.Size = new System.Drawing.Size(90, 77);
+            this.L1Txt9.TabIndex = 16;
+            this.L1Txt9.Text = "测试结果:";
+            this.L1Txt9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt8
+            // 
+            this.L1Txt8.AutoSize = true;
+            this.L1Txt8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt8.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt8.Location = new System.Drawing.Point(259, 228);
+            this.L1Txt8.Name = "L1Txt8";
+            this.L1Txt8.Size = new System.Drawing.Size(111, 76);
+            this.L1Txt8.TabIndex = 14;
+            this.L1Txt8.Text = "泄露值:";
+            this.L1Txt8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt7
+            // 
+            this.L1Txt7.AutoSize = true;
+            this.L1Txt7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt7.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt7.Location = new System.Drawing.Point(3, 228);
+            this.L1Txt7.Name = "L1Txt7";
+            this.L1Txt7.Size = new System.Drawing.Size(90, 76);
+            this.L1Txt7.TabIndex = 12;
+            this.L1Txt7.Text = "压力值:";
+            this.L1Txt7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt6
+            // 
+            this.R1Txt6.AutoSize = true;
+            this.R1Txt6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt6.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt6.Location = new System.Drawing.Point(376, 152);
+            this.R1Txt6.Name = "R1Txt6";
+            this.R1Txt6.Size = new System.Drawing.Size(157, 76);
+            this.R1Txt6.TabIndex = 11;
+            this.R1Txt6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt6
+            // 
+            this.L1Txt6.AutoSize = true;
+            this.L1Txt6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt6.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt6.Location = new System.Drawing.Point(259, 152);
+            this.L1Txt6.Name = "L1Txt6";
+            this.L1Txt6.Size = new System.Drawing.Size(111, 76);
+            this.L1Txt6.TabIndex = 10;
+            this.L1Txt6.Text = "测试时间:";
+            this.L1Txt6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt5
+            // 
+            this.R1Txt5.AutoSize = true;
+            this.R1Txt5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt5.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt5.Location = new System.Drawing.Point(99, 152);
+            this.R1Txt5.Name = "R1Txt5";
+            this.R1Txt5.Size = new System.Drawing.Size(154, 76);
+            this.R1Txt5.TabIndex = 9;
+            this.R1Txt5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt5
+            // 
+            this.L1Txt5.AutoSize = true;
+            this.L1Txt5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt5.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt5.Location = new System.Drawing.Point(3, 152);
+            this.L1Txt5.Name = "L1Txt5";
+            this.L1Txt5.Size = new System.Drawing.Size(90, 76);
+            this.L1Txt5.TabIndex = 8;
+            this.L1Txt5.Text = "稳压时间:";
+            this.L1Txt5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt4
+            // 
+            this.R1Txt4.AutoSize = true;
+            this.R1Txt4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt4.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt4.Location = new System.Drawing.Point(376, 76);
+            this.R1Txt4.Name = "R1Txt4";
+            this.R1Txt4.Size = new System.Drawing.Size(157, 76);
+            this.R1Txt4.TabIndex = 7;
+            this.R1Txt4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt4
+            // 
+            this.L1Txt4.AutoSize = true;
+            this.L1Txt4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt4.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt4.Location = new System.Drawing.Point(259, 76);
+            this.L1Txt4.Name = "L1Txt4";
+            this.L1Txt4.Size = new System.Drawing.Size(111, 76);
+            this.L1Txt4.TabIndex = 6;
+            this.L1Txt4.Text = "充气时间:";
+            this.L1Txt4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt3
+            // 
+            this.R1Txt3.AutoSize = true;
+            this.R1Txt3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt3.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt3.Location = new System.Drawing.Point(99, 76);
+            this.R1Txt3.Name = "R1Txt3";
+            this.R1Txt3.Size = new System.Drawing.Size(154, 76);
+            this.R1Txt3.TabIndex = 5;
+            this.R1Txt3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt3
+            // 
+            this.L1Txt3.AutoSize = true;
+            this.L1Txt3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt3.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt3.Location = new System.Drawing.Point(3, 76);
+            this.L1Txt3.Name = "L1Txt3";
+            this.L1Txt3.Size = new System.Drawing.Size(90, 76);
+            this.L1Txt3.TabIndex = 4;
+            this.L1Txt3.Text = "工位号:";
+            this.L1Txt3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt2
+            // 
+            this.R1Txt2.AutoSize = true;
+            this.R1Txt2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt2.Location = new System.Drawing.Point(376, 0);
+            this.R1Txt2.Name = "R1Txt2";
+            this.R1Txt2.Size = new System.Drawing.Size(157, 76);
+            this.R1Txt2.TabIndex = 3;
+            this.R1Txt2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt2
+            // 
+            this.L1Txt2.AutoSize = true;
+            this.L1Txt2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt2.Location = new System.Drawing.Point(259, 0);
+            this.L1Txt2.Name = "L1Txt2";
+            this.L1Txt2.Size = new System.Drawing.Size(111, 76);
+            this.L1Txt2.TabIndex = 2;
+            this.L1Txt2.Text = "发送开始信息:";
+            this.L1Txt2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt1
+            // 
+            this.R1Txt1.AutoSize = true;
+            this.R1Txt1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt1.Location = new System.Drawing.Point(99, 0);
+            this.R1Txt1.Name = "R1Txt1";
+            this.R1Txt1.Size = new System.Drawing.Size(154, 76);
+            this.R1Txt1.TabIndex = 1;
+            this.R1Txt1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // L1Txt1
+            // 
+            this.L1Txt1.AutoSize = true;
+            this.L1Txt1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.L1Txt1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.L1Txt1.Location = new System.Drawing.Point(3, 0);
+            this.L1Txt1.Name = "L1Txt1";
+            this.L1Txt1.Size = new System.Drawing.Size(90, 76);
+            this.L1Txt1.TabIndex = 0;
+            this.L1Txt1.Text = "日期时间:";
+            this.L1Txt1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt7
+            // 
+            this.R1Txt7.AutoSize = true;
+            this.R1Txt7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.R1Txt7.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt7.Location = new System.Drawing.Point(99, 228);
+            this.R1Txt7.Name = "R1Txt7";
+            this.R1Txt7.Size = new System.Drawing.Size(154, 76);
+            this.R1Txt7.TabIndex = 15;
+            this.R1Txt7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // R1Txt8
+            // 
+            this.R1Txt8.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.R1Txt8.BackColor = System.Drawing.SystemColors.Control;
+            this.R1Txt8.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.R1Txt8.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.R1Txt8.Location = new System.Drawing.Point(376, 250);
+            this.R1Txt8.Name = "R1Txt8";
+            this.R1Txt8.Size = new System.Drawing.Size(136, 32);
+            this.R1Txt8.TabIndex = 13;
+            this.R1Txt8.KeyDown += new System.Windows.Forms.KeyEventHandler(this.R1Txt8_KeyDown);
+            // 
+            // Result1
+            // 
+            this.Result1.Location = new System.Drawing.Point(904, 239);
+            this.Result1.Name = "Result1";
+            this.Result1.Size = new System.Drawing.Size(680, 39);
+            this.Result1.TabIndex = 14;
+            // 
             // Make_AirTightnessTest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1366, 768);
+            this.ClientSize = new System.Drawing.Size(1600, 900);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.SNDetails);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -685,6 +1029,11 @@
             this.SNDetails.ResumeLayout(false);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            this.Pagination.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tableLayoutPanel4.ResumeLayout(false);
+            this.tableLayoutPanel4.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -738,5 +1087,30 @@
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.TextBox RTxt8;
         private System.Windows.Forms.Button ClearMsg;
+        private System.Windows.Forms.TabControl Pagination;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
+        private System.Windows.Forms.Label R1Txt10;
+        private System.Windows.Forms.Label L1Txt10;
+        private System.Windows.Forms.Label R1Txt9;
+        private System.Windows.Forms.Label L1Txt9;
+        private System.Windows.Forms.Label L1Txt8;
+        private System.Windows.Forms.Label L1Txt7;
+        private System.Windows.Forms.Label R1Txt6;
+        private System.Windows.Forms.Label L1Txt6;
+        private System.Windows.Forms.Label R1Txt5;
+        private System.Windows.Forms.Label L1Txt5;
+        private System.Windows.Forms.Label R1Txt4;
+        private System.Windows.Forms.Label L1Txt4;
+        private System.Windows.Forms.Label R1Txt3;
+        private System.Windows.Forms.Label L1Txt3;
+        private System.Windows.Forms.Label R1Txt2;
+        private System.Windows.Forms.Label L1Txt2;
+        private System.Windows.Forms.Label R1Txt1;
+        private System.Windows.Forms.Label L1Txt1;
+        private System.Windows.Forms.Label R1Txt7;
+        private System.Windows.Forms.TextBox R1Txt8;
+        private System.Windows.Forms.TextBox Result1;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_AirTightnessTest.cs

@@ -1,5 +1,6 @@
 using DevExpress.Utils.Drawing.Helpers;
 using NPOI.SS.Formula.Functions;
+using Seagull.BarTender.Print;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,6 +12,7 @@ using System.Text;
 using System.Threading;
 using System.Web.Services.Description;
 using System.Windows.Forms;
+using UAS_MES_NEW.CustomControl.Pagination;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
 using UAS_MES_NEW.PublicMethod;
@@ -33,6 +35,9 @@ namespace UAS_MES_NEW.Make
         string mTestVal;
 
         SerialPort serialPort = new SerialPort();
+        StringBuilder receivedData = new StringBuilder();
+        DateTime lastReceiveTime = DateTime.Now;
+        readonly object lockObj = new object();
 
         private void Make_AirTightnessTest_Load(object sender, EventArgs e)
         {
@@ -120,7 +125,6 @@ namespace UAS_MES_NEW.Make
                 UpdateSN("L", FirstSN.Text);
                 Thread thread = new Thread(() =>
                 {
-                    bool success = false;
                     if (SendCom(mTestVal))
                     {
                         ShowMsg(1, "已发送指令,请稍等测试结果");
@@ -160,7 +164,6 @@ namespace UAS_MES_NEW.Make
                 UpdateSN("L", SecondSN.Text);
                 Thread thread = new Thread(() =>
                 {
-                    bool success = false;
                     if (SendCom(mTestVal))
                     {
                         ShowMsg(1, "已发送指令,请稍等测试结果");
@@ -181,6 +184,7 @@ namespace UAS_MES_NEW.Make
                 serialPort.BaudRate = Convert.ToInt32(BaudRate.Text);
                 if (!serialPort.IsOpen) serialPort.Open();
                 serialPort.WriteLine(workStation);
+                Serial_DataReceived(null,null);
                 return true;
             }
             catch (Exception ex)
@@ -191,31 +195,58 @@ namespace UAS_MES_NEW.Make
         }
         private void Serial_DataReceived(object sender, SerialDataReceivedEventArgs e)
         {
+            if (serialPort.BytesToRead < 0)
+            {
+                return;
+            }
             try
             {
-                SerialPort sp = (SerialPort)sender;
-                Result.Text = sp.ReadExisting();
+                string resList = serialPort.ReadExisting();
+                receivedData.Append(resList);
 
-                LoadTestDetail("L", out string testRes);
-                if (testRes == "NG")
+                //resList = "/20251014_142742/0K/2#/NULL/30/99/0/12700/0/N/0K";
+                lock (lockObj)
                 {
-                    RTxt8.Focus();
-                    RTxt8.SelectAll();
+                    receivedData.Append(resList);
+                    lastReceiveTime = DateTime.Now;
+                    if(receivedData.Length > 0)
+                    {
+                        string completeData = receivedData.ToString();
+                        this.Invoke(new Action(() =>
+                        {
+                            if (mTestVal == "LWS1")
+                            {
+                                Result.Text = completeData;
+                                CheckPassStation(FirstSN.Text, Result.Text);
+                                LoadTestDetail("L", out string testRes);
+                                if (testRes == "NG")
+                                {
+                                    Pagination.SelectedIndex = 0;
+                                    RTxt8.Focus();
+                                    RTxt8.SelectAll();
+                                }
+                            }
+                            else if (mTestVal == "LWS2")
+                            {
+                                Result1.Text = completeData;
+                                CheckPassStation(SecondSN.Text, Result1.Text);
+                                LoadTestDetail("L", out string testRes);
+                                if (testRes == "NG")
+                                {
+                                    Pagination.SelectedIndex = 1;
+                                    R1Txt8.Focus();
+                                    R1Txt8.SelectAll();
+                                }
+                            }
+                            receivedData.Clear();
+                        }));
+                    }
                 }
-                if(mTestVal == "LWS1")  CheckPassStation(FirstSN.Text, testRes);
-                else if(mTestVal == "LWS2") CheckPassStation(SecondSN.Text, testRes);
             }
             catch (Exception ex)
             {
                 ShowMsg(0, $"数据接收错误: {ex.Message}");
             }
-            finally
-            {
-                if (serialPort.IsOpen)
-                {
-                    serialPort.Close();
-                }
-            }
         }
 
         private void CheckPassStation(string sn,string res)
@@ -289,7 +320,6 @@ namespace UAS_MES_NEW.Make
                 RTxt10.Text = "";
             }
             testRes = "";
-
         }
 
         private void RTxt8_KeyDown(object sender, KeyEventArgs e)
@@ -300,22 +330,30 @@ namespace UAS_MES_NEW.Make
             if (Convert.ToInt32(RTxt8.Text) < 100)
             {
                 RTxt9.Text = "Y";
-                if (mTestVal == "LWS1")
-                {
-                    FirstSN.Focus();
-                    FirstSN.SelectAll();
-                    CheckPassStation(SecondSN.Text, "OK");
-                }
-                else if (mTestVal == "LWS2") 
-                {
-                    SecondSN.Focus();
-                    SecondSN.SelectAll();
-                    CheckPassStation(SecondSN.Text, "OK");
-                }
+
+                FirstSN.Focus();
+                FirstSN.SelectAll();
+                CheckPassStation(FirstSN.Text, "OK");
             }
             RTxt8.Focus();
             RTxt8.SelectAll();
         }
+        private void R1Txt8_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+            R1Txt8.Text = R1Txt8.Text.Trim();
+
+            if (Convert.ToInt32(R1Txt8.Text) < 100)
+            {
+                R1Txt9.Text = "Y";
+
+                SecondSN.Focus();
+                SecondSN.SelectAll();
+                CheckPassStation(SecondSN.Text, "OK");
+            }
+            R1Txt8.Focus();
+            R1Txt8.SelectAll();
+        }
 
         private void ClearMsg_Click(object sender, EventArgs e)
         {

UAS_MES_HYSX/FunctionCode/Make/Make_ParseLog.Designer.cs

@@ -35,6 +35,16 @@
             this.Choose = new System.Windows.Forms.Button();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.FileBox = new System.Windows.Forms.GroupBox();
+            this.Clear = new System.Windows.Forms.Button();
+            this.Delete = new System.Windows.Forms.Button();
+            this.Generate = new System.Windows.Forms.Button();
+            this.SN6 = new System.Windows.Forms.TextBox();
+            this.SN5 = new System.Windows.Forms.TextBox();
+            this.SN4 = new System.Windows.Forms.TextBox();
+            this.SN3 = new System.Windows.Forms.TextBox();
+            this.SN2 = new System.Windows.Forms.TextBox();
+            this.SN1 = new System.Windows.Forms.TextBox();
             this.onWatch = new System.Windows.Forms.Button();
             this.claerBtn = new System.Windows.Forms.Button();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
@@ -46,6 +56,7 @@
             this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.panel1.SuspendLayout();
+            this.FileBox.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -112,6 +123,7 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.Control;
+            this.panel1.Controls.Add(this.FileBox);
             this.panel1.Controls.Add(this.onWatch);
             this.panel1.Controls.Add(this.claerBtn);
             this.panel1.Controls.Add(this.LockMakeCode);
@@ -126,9 +138,118 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1304, 296);
+            this.panel1.Size = new System.Drawing.Size(1600, 296);
             this.panel1.TabIndex = 7;
             // 
+            // FileBox
+            // 
+            this.FileBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.FileBox.Controls.Add(this.Clear);
+            this.FileBox.Controls.Add(this.Delete);
+            this.FileBox.Controls.Add(this.Generate);
+            this.FileBox.Controls.Add(this.SN6);
+            this.FileBox.Controls.Add(this.SN5);
+            this.FileBox.Controls.Add(this.SN4);
+            this.FileBox.Controls.Add(this.SN3);
+            this.FileBox.Controls.Add(this.SN2);
+            this.FileBox.Controls.Add(this.SN1);
+            this.FileBox.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FileBox.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.FileBox.Location = new System.Drawing.Point(801, 25);
+            this.FileBox.Name = "FileBox";
+            this.FileBox.Size = new System.Drawing.Size(759, 244);
+            this.FileBox.TabIndex = 10;
+            this.FileBox.TabStop = false;
+            this.FileBox.Text = "Xray序列号文件名生成";
+            this.FileBox.Visible = false;
+            // 
+            // Clear
+            // 
+            this.Clear.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Clear.Location = new System.Drawing.Point(329, 193);
+            this.Clear.Name = "Clear";
+            this.Clear.Size = new System.Drawing.Size(117, 36);
+            this.Clear.TabIndex = 8;
+            this.Clear.Text = "一键清理";
+            this.Clear.UseVisualStyleBackColor = true;
+            this.Clear.Click += new System.EventHandler(this.Clear_Click);
+            // 
+            // Delete
+            // 
+            this.Delete.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Delete.Location = new System.Drawing.Point(489, 193);
+            this.Delete.Name = "Delete";
+            this.Delete.Size = new System.Drawing.Size(117, 36);
+            this.Delete.TabIndex = 7;
+            this.Delete.Text = "一键删除";
+            this.Delete.UseVisualStyleBackColor = true;
+            this.Delete.Click += new System.EventHandler(this.Delete_Click);
+            // 
+            // Generate
+            // 
+            this.Generate.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Generate.Location = new System.Drawing.Point(174, 193);
+            this.Generate.Name = "Generate";
+            this.Generate.Size = new System.Drawing.Size(117, 36);
+            this.Generate.TabIndex = 6;
+            this.Generate.Text = "一键生成";
+            this.Generate.UseVisualStyleBackColor = true;
+            this.Generate.Click += new System.EventHandler(this.Generate_Click);
+            // 
+            // SN6
+            // 
+            this.SN6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN6.Location = new System.Drawing.Point(522, 128);
+            this.SN6.Name = "SN6";
+            this.SN6.Size = new System.Drawing.Size(222, 31);
+            this.SN6.TabIndex = 5;
+            this.SN6.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN6_KeyDown);
+            // 
+            // SN5
+            // 
+            this.SN5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN5.Location = new System.Drawing.Point(271, 128);
+            this.SN5.Name = "SN5";
+            this.SN5.Size = new System.Drawing.Size(222, 31);
+            this.SN5.TabIndex = 4;
+            this.SN5.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN5_KeyDown);
+            // 
+            // SN4
+            // 
+            this.SN4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN4.Location = new System.Drawing.Point(20, 128);
+            this.SN4.Name = "SN4";
+            this.SN4.Size = new System.Drawing.Size(222, 31);
+            this.SN4.TabIndex = 3;
+            this.SN4.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN4_KeyDown);
+            // 
+            // SN3
+            // 
+            this.SN3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN3.Location = new System.Drawing.Point(522, 55);
+            this.SN3.Name = "SN3";
+            this.SN3.Size = new System.Drawing.Size(222, 31);
+            this.SN3.TabIndex = 2;
+            this.SN3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN3_KeyDown);
+            // 
+            // SN2
+            // 
+            this.SN2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN2.Location = new System.Drawing.Point(271, 55);
+            this.SN2.Name = "SN2";
+            this.SN2.Size = new System.Drawing.Size(222, 31);
+            this.SN2.TabIndex = 1;
+            this.SN2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN2_KeyDown);
+            // 
+            // SN1
+            // 
+            this.SN1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SN1.Location = new System.Drawing.Point(20, 55);
+            this.SN1.Name = "SN1";
+            this.SN1.Size = new System.Drawing.Size(222, 31);
+            this.SN1.TabIndex = 0;
+            this.SN1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SN1_KeyDown);
+            // 
             // onWatch
             // 
             this.onWatch.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -217,7 +338,7 @@
             this.lstOk.ItemHeight = 28;
             this.lstOk.Location = new System.Drawing.Point(3, 3);
             this.lstOk.Name = "lstOk";
-            this.lstOk.Size = new System.Drawing.Size(1298, 206);
+            this.lstOk.Size = new System.Drawing.Size(1594, 235);
             this.lstOk.TabIndex = 1;
             // 
             // lstFiles
@@ -227,9 +348,9 @@
             this.lstFiles.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lstFiles.FormattingEnabled = true;
             this.lstFiles.ItemHeight = 22;
-            this.lstFiles.Location = new System.Drawing.Point(3, 215);
+            this.lstFiles.Location = new System.Drawing.Point(3, 244);
             this.lstFiles.Name = "lstFiles";
-            this.lstFiles.Size = new System.Drawing.Size(1298, 312);
+            this.lstFiles.Size = new System.Drawing.Size(1594, 357);
             this.lstFiles.TabIndex = 0;
             this.lstFiles.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.lstFiles_DrawItem);
             // 
@@ -249,7 +370,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 60F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1304, 530);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1600, 604);
             this.tableLayoutPanel1.TabIndex = 8;
             // 
             // Make_ParseLog
@@ -257,7 +378,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Window;
-            this.ClientSize = new System.Drawing.Size(1304, 826);
+            this.ClientSize = new System.Drawing.Size(1600, 900);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.panel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -266,6 +387,8 @@
             this.Load += new System.EventHandler(this.Make_ParseLog_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.FileBox.ResumeLayout(false);
+            this.FileBox.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -290,5 +413,15 @@
         private System.Windows.Forms.Button onWatch;
         private System.Windows.Forms.ListBox lstOk;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.GroupBox FileBox;
+        private System.Windows.Forms.TextBox SN1;
+        private System.Windows.Forms.TextBox SN6;
+        private System.Windows.Forms.TextBox SN5;
+        private System.Windows.Forms.TextBox SN4;
+        private System.Windows.Forms.TextBox SN3;
+        private System.Windows.Forms.TextBox SN2;
+        private System.Windows.Forms.Button Generate;
+        private System.Windows.Forms.Button Delete;
+        private System.Windows.Forms.Button Clear;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_ParseLog.cs

@@ -100,6 +100,7 @@ namespace UAS_MES_NEW.Make
 
             if(ChangeWoTimer.Enabled)   ChangeWoTimer.Stop();
             onWatch.Enabled = true;
+            FileBox.Visible = false;
 
             switch (Device.SelectedIndex)
             {
@@ -113,6 +114,7 @@ namespace UAS_MES_NEW.Make
                     currFileType = "bmp";
                     equiType = "Xray";
                     onWatch.Enabled = false;
+                    FileBox.Visible = true;
                     break;
                 case 2:
                     currFileType = "jpg";
@@ -681,6 +683,177 @@ namespace UAS_MES_NEW.Make
                 }
             }
         }
+
+        private void Delete_Click(object sender, EventArgs e)
+        {
+            if (!Directory.Exists(txtPath.Text))
+            {
+                LogMessage(0, $"删除路径不存在: {txtPath.Text}");
+                return;
+            }
+            List<string> DeleteList = new List<string>() { };
+            DeleteList.Add(SN1.Text);
+            DeleteList.Add(SN2.Text);
+            DeleteList.Add(SN3.Text);
+            DeleteList.Add(SN4.Text);
+            DeleteList.Add(SN5.Text);
+            DeleteList.Add(SN6.Text);
+
+            string DeletePath;
+            int DeleteCount = 0;
+            foreach (var item in DeleteList)
+            {
+                DeletePath = Path.Combine(txtPath.Text, item);
+                if (DeletePath == txtPath.Text)
+                {
+                    LogMessage(0, $"NG,路径{DeletePath}中,没有 {item} 文件夹");
+                    continue;
+                }
+                if (Directory.Exists(DeletePath))
+                {
+                    try
+                    {
+                        Directory.Delete(DeletePath);
+                    }
+                    catch (IOException ex)
+                    {
+                        LogMessage(0, $"NG,文件夹{item}存有文件,{ex.Message}");
+                        continue;
+                    }
+                    catch (Exception ex)
+                    {
+                        LogMessage(0, $"NG,删除异常,{ex.Message}");
+                        continue;
+                    }
+                    DeleteCount++;
+
+                    if (SN1.Text == item) SN1.Text = "";
+                    if (SN2.Text == item) SN2.Text = "";
+                    if (SN3.Text == item) SN3.Text = "";
+                    if (SN4.Text == item) SN4.Text = "";
+                    if (SN5.Text == item) SN5.Text = "";
+                    if (SN6.Text == item) SN6.Text = "";
+                }
+            }
+            if(DeleteCount != 0)
+            {
+                LogMessage(0, $"一键删除文件夹成功,共 {DeleteCount}个");
+                return;
+            }
+            else
+            {
+                LogMessage(0, $"NG,请扫描SN序列号删除文件夹");
+            }
+        }
+
+        private void Clear_Click(object sender, EventArgs e)
+        {
+            SN1.Text = "";
+            SN2.Text = "";
+            SN3.Text = "";
+            SN4.Text = "";
+            SN5.Text = "";
+            SN6.Text = "";
+            SN1.Focus();
+            SN1.SelectAll();
+        }
+
+        private void Generate_Click(object sender, EventArgs e)
+        {
+            if (!Directory.Exists(txtPath.Text))
+            {
+                LogMessage(0, $"NG,生成路径不存在: {txtPath.Text}");
+                return;
+            }
+
+            List<string> GenerateList = new List<string>() { };
+            GenerateList.Add(SN1.Text);
+            GenerateList.Add(SN2.Text);
+            GenerateList.Add(SN3.Text);
+            GenerateList.Add(SN4.Text);
+            GenerateList.Add(SN5.Text);
+            GenerateList.Add(SN6.Text);
+
+            string GeneratePath;
+            int GenerateCount = 0;
+            foreach (var item in GenerateList)
+            {
+                GeneratePath = Path.Combine(txtPath.Text, item);
+                if (GeneratePath == txtPath.Text)
+                {
+                    LogMessage(0, $"NG,请扫描SN序列号创建文件夹");
+                    continue;
+                }
+                if (Directory.Exists(GeneratePath))
+                {
+                    LogMessage(0, $"NG,路径{txtPath.Text}已有{item}文件夹");
+                    continue;
+                }
+                Directory.CreateDirectory(GeneratePath);
+                GenerateCount++;
+            }
+            if(GenerateCount != 0) LogMessage(0, $"一键生成文件夹成功,共 {GenerateCount}个");
+        }
+
+        private void SN1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN1.Text)) return;
+
+            SN2.Focus();
+            SN2.SelectAll();
+        }
+
+        private void SN2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN2.Text)) return;
+
+            SN3.Focus();
+            SN3.SelectAll();
+        }
+
+        private void SN3_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN3.Text)) return;
+
+            SN4.Focus();
+            SN4.SelectAll();
+        }
+
+        private void SN4_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN4.Text)) return;
+
+            SN5.Focus();
+            SN5.SelectAll();
+        }
+
+        private void SN5_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN5.Text)) return;
+
+            SN6.Focus();
+            SN6.SelectAll();
+        }
+
+        private void SN6_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(SN6.Text)) return;
+
+            Generate.Focus();
+        }
+
         public string CheckFileAccess(string filePath)
         {
             try

UAS_MES_HYSX/FunctionCode/Make/Make_WirelessThroughput.cs

@@ -15,7 +15,6 @@ using System.Web.UI.WebControls.WebParts;
 using System.Windows.Forms;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 
 namespace UAS_MES_NEW.Make
 {
@@ -42,24 +41,27 @@ namespace UAS_MES_NEW.Make
             ShowMsg(1, $"开始测试");
             var tester = new CameraIperfTester(
                 cameraIp: ProductList.Text.Trim(),
+                cameraPort: 23,
                 username: Account.Text.Trim(),
                 password: ProductList.Text.Trim(),
-                iperfServerIp: IPList.Text.Trim()
+                iperfServerIp: IPList.Text.Trim(),
+                iperfServerPort : 5201
             );
 
-            var loginResult = tester.TelnetLogin();
-            if (!loginResult.Success)
+            string Msg = tester.TelnetConnect();
+            if (Msg.Substring(0,2) != "OK")
             {
-                ShowMsg(0, $"Telnet登录失败,{loginResult.Message}");
+                ShowMsg(0, $"Telnet登录失败,{Msg}");
                 return;
             }
             ShowMsg(1, $"Telnet登录成功");
 
-            var testResult = tester.StartIperfTest(
-                iperfToolPath: @"C:\iperf\iperf3.exe",
-                logDirectory: @"C:\iperf_logs"
-            );
-
+            Msg = tester.StartIperfTest(@"D:\MesCoder\Company\慧眼\吞吐量测试\iperf3.exe", @"D:\MesCoder\Company\慧眼\吞吐量测试\iperf_logs");
+            if (Msg.Substring(0, 2) != "OK")
+            {
+                ShowMsg(0, $"iperf3启动失败,{Msg}");
+                return;
+            }
         }
 
         private void SN_KeyDown(object sender, KeyEventArgs e)
@@ -144,6 +146,128 @@ namespace UAS_MES_NEW.Make
             }
         }
 
+        public class CameraIperfTester
+        {
+            string cameraIp;
+            int cameraPort;
+            string username;
+            string password;
+            string iperfServerIp;
+            int iperfServerPort;
+            public CameraIperfTester(string cameraIp, int cameraPort, string username, string password, string iperfServerIp, int iperfServerPort)
+            {
+                this.cameraIp = cameraIp;
+                this.cameraPort = cameraPort;
+                this.username = username;
+                this.password = password;
+                this.iperfServerIp = iperfServerIp;
+                this.iperfServerPort = iperfServerPort;
+            }
+
+            public string StartIperfTest(string iperfPath,string logDirectory)
+            {
+                return "OK,测试";
+            }
+
+            public string TelnetConnect()
+            {
+                try
+                {
+                    using (TcpClient client = new TcpClient())
+                    {
+                        IAsyncResult connectResult = client.BeginConnect(cameraIp, cameraPort, null, null);
+                        bool connected = connectResult.AsyncWaitHandle.WaitOne(TimeSpan.FromMilliseconds(5000)); // 5秒连接超时
+
+                        if (!connected)
+                        {
+                            client.Close();
+                            return "NG,连接超时";
+                        }
+
+                        try
+                        {
+                            client.EndConnect(connectResult);
+                        }
+                        catch (SocketException ex)
+                        {
+                            return $"NG,连接失败: {ex.Message}";
+                        }
+
+                        using (NetworkStream stream = client.GetStream())
+                        {
+                            // 3S读取超时
+                            stream.ReadTimeout = 3000;
+
+                            StringBuilder fullResponse = new StringBuilder();
+
+                            string welcomeResponse = ReadStream(stream);
+                            fullResponse.Append(welcomeResponse);
+
+                            WriteStream(stream, username);
+                            string usernameResponse = ReadStream(stream);
+                            fullResponse.Append(usernameResponse);
+
+                            WriteStream(stream, password);
+                            string loginResponse = ReadStream(stream);
+                            fullResponse.Append(loginResponse);
+
+                            return $"OK,{fullResponse.ToString()}";
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    return $"NG,{ex.Message}";
+                }
+            }
+
+            private void WriteStream(NetworkStream stream, string text)
+            {
+                byte[] data = Encoding.ASCII.GetBytes(text + "\r\n");
+                stream.Write(data, 0, data.Length);
+                stream.Flush();
+            }
+
+            private string ReadStream(NetworkStream stream)
+            {
+                StringBuilder sb = new StringBuilder();
+                byte[] buffer = new byte[1024];
+                int totalBytesRead = 0;
+                int currentBytesRead = 0;
+                DateTime lastReadTime = DateTime.UtcNow;
+                TimeSpan idleTimeout = TimeSpan.FromMilliseconds(800); // 空闲超时
+
+                try
+                {
+                    do
+                    {
+                        currentBytesRead = stream.Read(buffer, 0, buffer.Length);
+                        if (currentBytesRead > 0)
+                        {
+                            sb.Append(Encoding.ASCII.GetString(buffer, 0, currentBytesRead));
+                            totalBytesRead += currentBytesRead;
+                            lastReadTime = DateTime.UtcNow;
+                        }
+
+                    } while ((DateTime.UtcNow - lastReadTime) < idleTimeout);
+
+                }
+                catch (IOException ioEx)
+                {
+
+                }
+                catch (ObjectDisposedException)
+                {
+                    throw;
+                }
+                catch (SocketException sockEx)
+                {
+                    throw new IOException($"NG,网络错误: {sockEx.Message}", sockEx);
+                }
+                return sb.ToString();
+            }
+        }
+
         private void ShowMsg(int type, string msg)
         {
             msg = msg.Replace("\r", "").Replace("\n", "");
@@ -216,252 +340,5 @@ namespace UAS_MES_NEW.Make
             TestTime.SelectAll();
         }
 
-        public class CameraIperfTester
-        {
-            string cameraIp;
-            string username;
-            string password;
-            string iperfServerIp;
-            int telnetPort;
-            public CameraIperfTester(string cameraIp, string username, string password, string iperfServerIp, int telnetPort = 23)
-            {
-                this.cameraIp = cameraIp;
-                this.username = username;
-                this.password = password;
-                this.iperfServerIp = iperfServerIp;
-                this.telnetPort = telnetPort;
-            }
-            public TelnetLoginResult TelnetLogin()
-            {
-                try
-                {
-                    using (Process telnetProcess = new Process())
-                    {
-                        telnetProcess.StartInfo.FileName = "cmd.exe";
-                        telnetProcess.StartInfo.Arguments = $"/c telnet {cameraIp} {telnetPort}";
-                        telnetProcess.StartInfo.UseShellExecute = false;
-                        telnetProcess.StartInfo.RedirectStandardInput = true;
-                        telnetProcess.StartInfo.RedirectStandardOutput = true;
-                        telnetProcess.StartInfo.RedirectStandardError = true;
-                        telnetProcess.StartInfo.CreateNoWindow = true;
-
-                        StringBuilder output = new StringBuilder();
-                        AutoResetEvent outputWaitHandle = new AutoResetEvent(false);
-
-                        telnetProcess.OutputDataReceived += (sender, e) =>
-                        {
-                            if (e.Data == null)
-                            {
-                                outputWaitHandle.Set();
-                            }
-                            else
-                            {
-                                output.AppendLine(e.Data);
-                            }
-                        };
-
-                        telnetProcess.Start();
-                        telnetProcess.BeginOutputReadLine();
-
-                        // 发送登录凭证
-                        StreamWriter stdin = telnetProcess.StandardInput;
-                        stdin.WriteLine(username);
-                        Thread.Sleep(1000);
-                        stdin.WriteLine(password);
-                        Thread.Sleep(1000);
-
-                        // 检查登录是否成功的关键词
-                        string result = output.ToString();
-                        if (result.Contains("Login OK") || result.Contains("登录成功") || result.Contains("#") || result.Contains("$"))
-                        {
-                            stdin.WriteLine("exit");
-                            telnetProcess.WaitForExit(3000);
-                            return new TelnetLoginResult
-                            {
-                                Success = true,
-                                Message = result
-                            };
-                        }
-                        else
-                        {
-                            stdin.WriteLine("exit");
-                            telnetProcess.WaitForExit(3000);
-
-                            return new TelnetLoginResult
-                            {
-                                Success = false,
-                                Message = result
-                            };
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    return new TelnetLoginResult
-                    {
-                        Success = false,
-                        Message = $"Telnet登录异常: {ex.Message}",
-                        RawOutput = ex.ToString()
-                    };
-                }
-            }
-            public IperfTestResult StartIperfTest(string iperfToolPath, string logDirectory)
-            {
-                try
-                {
-                    // 生成基于时间的日志文件名
-                    string timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss");
-                    string upLogPath = Path.Combine(logDirectory, $"iperf_up_{timestamp}.log");
-                    string downLogPath = Path.Combine(logDirectory, $"iperf_down_{timestamp}.log");
-
-                    // 通过telnet执行iperf服务器端命令
-                    var telnetResult = ExecuteTelnetCommands();
-                    if (!telnetResult.Success)
-                    {
-                        return new IperfTestResult
-                        {
-                            Success = false,
-                            Message = "在摄像机端启动iperf服务器失败",
-                            UpLogPath = "",
-                            DownLogPath = ""
-                        };
-                    }
-
-                    // 测试上行流量
-                    ExecuteIperfTest(iperfToolPath, $"-c {iperfServerIp} -p 5201 -t 10 -w 1M -i 1 -P 8 -R", upLogPath);
-
-                    // 等待2S
-                    Thread.Sleep(2000);
-
-                    // 测试下行流量
-                    ExecuteIperfTest(iperfToolPath, $"-c {iperfServerIp} -p 5201 -t 10 -w 1M -i 1 -P 8", downLogPath);
-
-                    return new IperfTestResult
-                    {
-                        Success = true,
-                        Message = "iperf测试完成",
-                        UpLogPath = upLogPath,
-                        DownLogPath = downLogPath
-                    };
-                }
-                catch (Exception ex)
-                {
-                    return new IperfTestResult
-                    {
-                        Success = false,
-                        Message = $"iperf测试异常: {ex.Message}",
-                        UpLogPath = "",
-                        DownLogPath = ""
-                    };
-                }
-            }
-            private void ExecuteIperfTest(string iperfToolPath, string arguments, string logPath)
-            {
-                using (Process iperfProcess = new Process())
-                {
-                    iperfProcess.StartInfo.FileName = iperfToolPath;
-                    iperfProcess.StartInfo.Arguments = arguments;
-                    iperfProcess.StartInfo.UseShellExecute = false;
-                    iperfProcess.StartInfo.RedirectStandardOutput = true;
-                    iperfProcess.StartInfo.CreateNoWindow = true;
-
-                    iperfProcess.Start();
-
-                    string output = iperfProcess.StandardOutput.ReadToEnd();
-                    iperfProcess.WaitForExit();
-
-                    // 将输出写入日志文件
-                    File.WriteAllText(logPath, output);
-                }
-            }
-
-            private TelnetLoginResult ExecuteTelnetCommands()
-            {
-                try
-                {
-                    using (Process telnetProcess = new Process())
-                    {
-                        telnetProcess.StartInfo.FileName = "telnet";
-                        telnetProcess.StartInfo.Arguments = $"{cameraIp} {telnetPort}";
-                        telnetProcess.StartInfo.UseShellExecute = false;
-                        telnetProcess.StartInfo.RedirectStandardInput = true;
-                        telnetProcess.StartInfo.RedirectStandardOutput = true;
-                        telnetProcess.StartInfo.RedirectStandardError = true;
-                        telnetProcess.StartInfo.CreateNoWindow = true;
-
-                        StringBuilder output = new StringBuilder();
-                        AutoResetEvent outputWaitHandle = new AutoResetEvent(false);
-
-                        telnetProcess.OutputDataReceived += (sender, e) =>
-                        {
-                            if (e.Data == null)
-                            {
-                                outputWaitHandle.Set();
-                            }
-                            else
-                            {
-                                output.AppendLine(e.Data);
-                            }
-                        };
-
-                        telnetProcess.Start();
-                        telnetProcess.BeginOutputReadLine();
-
-                        StreamWriter stdin = telnetProcess.StandardInput;
-
-                        // 发送登录凭证
-                        stdin.WriteLine(username);
-                        Thread.Sleep(1000);
-                        stdin.WriteLine(password);
-                        Thread.Sleep(2000);
-
-                        // 执行iperf相关命令
-                        stdin.WriteLine("killall iperf3_mstar");
-                        Thread.Sleep(1000);
-                        stdin.WriteLine("cp /mnt/tf/usb1_1/iperf3_mstar /var/tmp/ -f");
-                        Thread.Sleep(1000);
-                        stdin.WriteLine("chmod a+x /var/tmp/iperf3_mstar");
-                        Thread.Sleep(1000);
-                        stdin.WriteLine("/var/tmp/iperf3_mstar -s -p 5201 -i 1 &");
-                        Thread.Sleep(2000);
-
-                        // 发送退出命令
-                        stdin.WriteLine("exit");
-                        telnetProcess.WaitForExit(5000);
-
-                        return new TelnetLoginResult
-                        {
-                            Success = true,
-                            Message = "Telnet命令执行完成",
-                            RawOutput = output.ToString()
-                        };
-                    }
-                }
-                catch (Exception ex)
-                {
-                    return new TelnetLoginResult
-                    {
-                        Success = false,
-                        Message = $"Telnet命令执行异常: {ex.Message}",
-                        RawOutput = ex.ToString()
-                    };
-                }
-            }
-
-            public class TelnetLoginResult
-            {
-                public bool Success { get; set; }
-                public string Message { get; set; }
-                public string RawOutput { get; set; }
-            }
-            public class IperfTestResult
-            {
-                public bool Success { get; set; }
-                public string Message { get; set; }
-                public string UpLogPath { get; set; }
-                public string DownLogPath { get; set; }
-            }
-            
-        }
-        }
+    }
 }