吞吐量日志处理，钢网界面调整

UAS_MES_HYSX/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -43,6 +43,21 @@
             this.su_singlepringqty1_label = new System.Windows.Forms.Label();
             this.SU_RETURNIFCLEAN = new System.Windows.Forms.CheckBox();
             this.em_code_label = new System.Windows.Forms.Label();
+            this.em_code1_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
+            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
+            this.label9 = new System.Windows.Forms.Label();
+            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.st_usecount = new System.Windows.Forms.Label();
+            this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ST_ENSIONA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIOND = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.ST_ENSIONE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.em_code1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.em_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.su_singlepringqty1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.st_table = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
@@ -52,25 +67,6 @@
             this.SU_DEVCODE1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SU_DEVCODE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ToolsBom = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.ma_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.em_code1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.em_code1_label = new System.Windows.Forms.Label();
-            this.ST_ENSIONA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ST_ENSIONA_label = new System.Windows.Forms.Label();
-            this.ST_ENSIONB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ST_ENSIONB_label = new System.Windows.Forms.Label();
-            this.ST_ENSIONC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ST_ENSIONC_label = new System.Windows.Forms.Label();
-            this.ST_ENSIOND = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.ST_ENSIONE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ST_ENSIONE_label = new System.Windows.Forms.Label();
-            this.label7 = new System.Windows.Forms.Label();
-            this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.st_usecount = new System.Windows.Forms.Label();
             this.su_stcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.st_pcbcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.su_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -79,6 +75,10 @@
             this.su_singlepringqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.su_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.su_usemacode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ma_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
             this.SuspendLayout();
             // 
@@ -120,7 +120,7 @@
             this.RadioReceive.AutoSize = true;
             this.RadioReceive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.RadioReceive.Location = new System.Drawing.Point(9, 741);
-            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RadioReceive.Margin = new System.Windows.Forms.Padding(4);
             this.RadioReceive.Name = "RadioReceive";
             this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
@@ -134,7 +134,7 @@
             this.RadioReturn.AutoSize = true;
             this.RadioReturn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.RadioReturn.Location = new System.Drawing.Point(9, 824);
-            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RadioReturn.Margin = new System.Windows.Forms.Padding(4);
             this.RadioReturn.Name = "RadioReturn";
             this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
@@ -183,9 +183,9 @@
             this.st_combinenumber_label.Location = new System.Drawing.Point(399, 828);
             this.st_combinenumber_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
-            this.st_combinenumber_label.Size = new System.Drawing.Size(134, 31);
+            this.st_combinenumber_label.Size = new System.Drawing.Size(110, 31);
             this.st_combinenumber_label.TabIndex = 89;
-            this.st_combinenumber_label.Text = "加工小板数";
+            this.st_combinenumber_label.Text = "印刷次数";
             // 
             // ma_qty_label
             // 
@@ -224,7 +224,7 @@
             this.SU_RETURNIFCLEAN.AutoSize = true;
             this.SU_RETURNIFCLEAN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(1038, 828);
-            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
             this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
@@ -242,13 +242,214 @@
             this.em_code_label.TabIndex = 111;
             this.em_code_label.Text = "人员编号";
             // 
+            // em_code1_label
+            // 
+            this.em_code1_label.AutoSize = true;
+            this.em_code1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.em_code1_label.Location = new System.Drawing.Point(729, 828);
+            this.em_code1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.em_code1_label.Name = "em_code1_label";
+            this.em_code1_label.Size = new System.Drawing.Size(110, 31);
+            this.em_code1_label.TabIndex = 113;
+            this.em_code1_label.Text = "人员编号";
+            // 
+            // ST_ENSIONA_label
+            // 
+            this.ST_ENSIONA_label.AutoSize = true;
+            this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONA_label.Location = new System.Drawing.Point(207, 888);
+            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
+            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
+            this.ST_ENSIONA_label.TabIndex = 124;
+            this.ST_ENSIONA_label.Text = "A";
+            // 
+            // ST_ENSIONB_label
+            // 
+            this.ST_ENSIONB_label.AutoSize = true;
+            this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONB_label.Location = new System.Drawing.Point(500, 888);
+            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
+            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
+            this.ST_ENSIONB_label.TabIndex = 122;
+            this.ST_ENSIONB_label.Text = "B";
+            // 
+            // ST_ENSIONC_label
+            // 
+            this.ST_ENSIONC_label.AutoSize = true;
+            this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONC_label.Location = new System.Drawing.Point(798, 888);
+            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
+            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
+            this.ST_ENSIONC_label.TabIndex = 120;
+            this.ST_ENSIONC_label.Text = "C";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(207, 928);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(32, 31);
+            this.label9.TabIndex = 118;
+            this.label9.Text = "D";
+            // 
+            // ST_ENSIONE_label
+            // 
+            this.ST_ENSIONE_label.AutoSize = true;
+            this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ST_ENSIONE_label.Location = new System.Drawing.Point(501, 928);
+            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
+            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
+            this.ST_ENSIONE_label.TabIndex = 116;
+            this.ST_ENSIONE_label.Text = "E";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(10, 888);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(194, 31);
+            this.label7.TabIndex = 115;
+            this.label7.Text = "张力测试结果(N)";
+            // 
+            // st_usecount
+            // 
+            this.st_usecount.AutoSize = true;
+            this.st_usecount.Location = new System.Drawing.Point(504, 792);
+            this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.st_usecount.Name = "st_usecount";
+            this.st_usecount.Size = new System.Drawing.Size(0, 18);
+            this.st_usecount.TabIndex = 127;
+            this.st_usecount.Visible = false;
+            // 
+            // Scrap
+            // 
+            this.Scrap.AllPower = null;
+            this.Scrap.BackColor = System.Drawing.Color.Transparent;
+            this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
+            this.Scrap.Image = null;
+            this.Scrap.IsShowBorder = true;
+            this.Scrap.Location = new System.Drawing.Point(1173, 921);
+            this.Scrap.Margin = new System.Windows.Forms.Padding(4);
+            this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
+            this.Scrap.Name = "Scrap";
+            this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
+            this.Scrap.Power = null;
+            this.Scrap.Size = new System.Drawing.Size(102, 42);
+            this.Scrap.TabIndex = 126;
+            this.Scrap.Text = "报废";
+            this.Scrap.UseVisualStyleBackColor = false;
+            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
+            // 
+            // ST_ENSIONA
+            // 
+            this.ST_ENSIONA.AllPower = null;
+            this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONA.ID = null;
+            this.ST_ENSIONA.Location = new System.Drawing.Point(248, 888);
+            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONA.Name = "ST_ENSIONA";
+            this.ST_ENSIONA.Negative = false;
+            this.ST_ENSIONA.Power = null;
+            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONA.Str = null;
+            this.ST_ENSIONA.Str1 = null;
+            this.ST_ENSIONA.Str2 = null;
+            this.ST_ENSIONA.TabIndex = 125;
+            // 
+            // ST_ENSIONB
+            // 
+            this.ST_ENSIONB.AllPower = null;
+            this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONB.ID = null;
+            this.ST_ENSIONB.Location = new System.Drawing.Point(540, 888);
+            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONB.Name = "ST_ENSIONB";
+            this.ST_ENSIONB.Negative = false;
+            this.ST_ENSIONB.Power = null;
+            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONB.Str = null;
+            this.ST_ENSIONB.Str1 = null;
+            this.ST_ENSIONB.Str2 = null;
+            this.ST_ENSIONB.TabIndex = 123;
+            // 
+            // ST_ENSIONC
+            // 
+            this.ST_ENSIONC.AllPower = null;
+            this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONC.ID = null;
+            this.ST_ENSIONC.Location = new System.Drawing.Point(838, 888);
+            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONC.Name = "ST_ENSIONC";
+            this.ST_ENSIONC.Negative = false;
+            this.ST_ENSIONC.Power = null;
+            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONC.Str = null;
+            this.ST_ENSIONC.Str1 = null;
+            this.ST_ENSIONC.Str2 = null;
+            this.ST_ENSIONC.TabIndex = 121;
+            // 
+            // ST_ENSIOND
+            // 
+            this.ST_ENSIOND.AllPower = null;
+            this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIOND.ID = null;
+            this.ST_ENSIOND.Location = new System.Drawing.Point(248, 928);
+            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIOND.Name = "ST_ENSIOND";
+            this.ST_ENSIOND.Negative = false;
+            this.ST_ENSIOND.Power = null;
+            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIOND.Str = null;
+            this.ST_ENSIOND.Str1 = null;
+            this.ST_ENSIOND.Str2 = null;
+            this.ST_ENSIOND.TabIndex = 119;
+            // 
+            // ST_ENSIONE
+            // 
+            this.ST_ENSIONE.AllPower = null;
+            this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
+            this.ST_ENSIONE.ID = null;
+            this.ST_ENSIONE.Location = new System.Drawing.Point(540, 928);
+            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4);
+            this.ST_ENSIONE.Name = "ST_ENSIONE";
+            this.ST_ENSIONE.Negative = false;
+            this.ST_ENSIONE.Power = null;
+            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
+            this.ST_ENSIONE.Str = null;
+            this.ST_ENSIONE.Str1 = null;
+            this.ST_ENSIONE.Str2 = null;
+            this.ST_ENSIONE.TabIndex = 117;
+            // 
+            // em_code1
+            // 
+            this.em_code1.AllPower = null;
+            this.em_code1.BackColor = System.Drawing.Color.White;
+            this.em_code1.ID = null;
+            this.em_code1.Location = new System.Drawing.Point(849, 830);
+            this.em_code1.Margin = new System.Windows.Forms.Padding(4);
+            this.em_code1.Name = "em_code1";
+            this.em_code1.Power = null;
+            this.em_code1.Size = new System.Drawing.Size(178, 28);
+            this.em_code1.Str = null;
+            this.em_code1.Str1 = null;
+            this.em_code1.Str2 = null;
+            this.em_code1.TabIndex = 114;
+            // 
             // em_code
             // 
             this.em_code.AllPower = null;
             this.em_code.BackColor = System.Drawing.Color.White;
             this.em_code.ID = null;
-            this.em_code.Location = new System.Drawing.Point(208, 788);
-            this.em_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.em_code.Location = new System.Drawing.Point(222, 789);
+            this.em_code.Margin = new System.Windows.Forms.Padding(4);
             this.em_code.Name = "em_code";
             this.em_code.Power = null;
             this.em_code.Size = new System.Drawing.Size(178, 28);
@@ -263,7 +464,7 @@
             this.su_singlepringqty1.BackColor = System.Drawing.Color.White;
             this.su_singlepringqty1.ID = null;
             this.su_singlepringqty1.Location = new System.Drawing.Point(838, 744);
-            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.su_singlepringqty1.Margin = new System.Windows.Forms.Padding(4);
             this.su_singlepringqty1.Name = "su_singlepringqty1";
             this.su_singlepringqty1.Negative = false;
             this.su_singlepringqty1.Power = null;
@@ -282,7 +483,7 @@
             "BOTTOM",
             "TOP"});
             this.st_table.Location = new System.Drawing.Point(483, 742);
-            this.st_table.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.st_table.Margin = new System.Windows.Forms.Padding(4);
             this.st_table.Name = "st_table";
             this.st_table.Size = new System.Drawing.Size(180, 26);
             this.st_table.TabIndex = 107;
@@ -295,7 +496,7 @@
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
             this.Receive.Location = new System.Drawing.Point(1246, 734);
-            this.Receive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Receive.Margin = new System.Windows.Forms.Padding(4);
             this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
             this.Receive.Name = "Receive";
             this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
@@ -314,7 +515,7 @@
             this.Return.Image = null;
             this.Return.IsShowBorder = true;
             this.Return.Location = new System.Drawing.Point(1173, 822);
-            this.Return.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Return.Margin = new System.Windows.Forms.Padding(4);
             this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
             this.Return.Name = "Return";
             this.Return.NormalImage = ((System.Drawing.Image)(resources.GetObject("Return.NormalImage")));
@@ -331,7 +532,7 @@
             this.st_combinenumber.BackColor = System.Drawing.Color.White;
             this.st_combinenumber.ID = null;
             this.st_combinenumber.Location = new System.Drawing.Point(540, 830);
-            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
             this.st_combinenumber.Size = new System.Drawing.Size(178, 28);
@@ -345,8 +546,8 @@
             this.SU_DEVCODE1.AllPower = null;
             this.SU_DEVCODE1.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE1.ID = null;
-            this.SU_DEVCODE1.Location = new System.Drawing.Point(227, 830);
-            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(222, 830);
+            this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
             this.SU_DEVCODE1.Size = new System.Drawing.Size(178, 28);
@@ -361,8 +562,8 @@
             this.SU_DEVCODE.AllPower = null;
             this.SU_DEVCODE.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE.ID = null;
-            this.SU_DEVCODE.Location = new System.Drawing.Point(227, 743);
-            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SU_DEVCODE.Location = new System.Drawing.Point(222, 743);
+            this.SU_DEVCODE.Margin = new System.Windows.Forms.Padding(4);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
             this.SU_DEVCODE.Size = new System.Drawing.Size(178, 28);
@@ -387,299 +588,22 @@
             this.su_usemacode});
             this.ToolsBom.EnableContentClick = true;
             this.ToolsBom.Location = new System.Drawing.Point(0, 57);
-            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ToolsBom.Margin = new System.Windows.Forms.Padding(4);
             this.ToolsBom.Name = "ToolsBom";
             this.ToolsBom.RowHeadersWidth = 82;
             this.ToolsBom.RowTemplate.Height = 27;
             this.ToolsBom.Size = new System.Drawing.Size(1359, 670);
             this.ToolsBom.TabIndex = 76;
             // 
-            // Confirm
+            // su_stcode
             // 
-            this.Confirm.AllPower = null;
-            this.Confirm.BackColor = System.Drawing.Color.Transparent;
-            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
-            this.Confirm.Image = null;
-            this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(1242, 6);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
-            this.Confirm.Name = "Confirm";
-            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
-            this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(102, 42);
-            this.Confirm.TabIndex = 75;
-            this.Confirm.Text = "确定";
-            this.Confirm.UseVisualStyleBackColor = false;
-            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网刮刀编号";
+            this.su_stcode.MinimumWidth = 10;
+            this.su_stcode.Name = "su_stcode";
+            this.su_stcode.Width = 200;
             // 
-            // li_code
-            // 
-            this.li_code.AllPower = null;
-            this.li_code.BackColor = System.Drawing.Color.White;
-            this.li_code.Caller = null;
-            this.li_code.Condition = null;
-            this.li_code.DBTitle = null;
-            this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(1028, 741);
-            this.li_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.li_code.Name = "li_code";
-            this.li_code.Power = null;
-            this.li_code.ReturnData = null;
-            this.li_code.SelectField = null;
-            this.li_code.SetValueField = null;
-            this.li_code.Size = new System.Drawing.Size(190, 32);
-            this.li_code.TabIndex = 74;
-            this.li_code.TableName = null;
-            this.li_code.TextBoxEnable = false;
-            // 
-            // ma_prodcode
-            // 
-            this.ma_prodcode.AllPower = null;
-            this.ma_prodcode.BackColor = System.Drawing.Color.White;
-            this.ma_prodcode.Enabled = false;
-            this.ma_prodcode.ID = null;
-            this.ma_prodcode.Location = new System.Drawing.Point(464, 14);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Power = null;
-            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
-            this.ma_prodcode.Str = null;
-            this.ma_prodcode.Str1 = null;
-            this.ma_prodcode.Str2 = null;
-            this.ma_prodcode.TabIndex = 72;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(123, 14);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(212, 32);
-            this.ma_code.TabIndex = 71;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            this.ma_code.TextKeyDown += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
-            // 
-            // em_code1
-            // 
-            this.em_code1.AllPower = null;
-            this.em_code1.BackColor = System.Drawing.Color.White;
-            this.em_code1.ID = null;
-            this.em_code1.Location = new System.Drawing.Point(849, 830);
-            this.em_code1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.em_code1.Name = "em_code1";
-            this.em_code1.Power = null;
-            this.em_code1.Size = new System.Drawing.Size(178, 28);
-            this.em_code1.Str = null;
-            this.em_code1.Str1 = null;
-            this.em_code1.Str2 = null;
-            this.em_code1.TabIndex = 114;
-            // 
-            // em_code1_label
-            // 
-            this.em_code1_label.AutoSize = true;
-            this.em_code1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code1_label.Location = new System.Drawing.Point(729, 828);
-            this.em_code1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.em_code1_label.Name = "em_code1_label";
-            this.em_code1_label.Size = new System.Drawing.Size(110, 31);
-            this.em_code1_label.TabIndex = 113;
-            this.em_code1_label.Text = "人员编号";
-            // 
-            // ST_ENSIONA
-            // 
-            this.ST_ENSIONA.AllPower = null;
-            this.ST_ENSIONA.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONA.ID = null;
-            this.ST_ENSIONA.Location = new System.Drawing.Point(248, 888);
-            this.ST_ENSIONA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ST_ENSIONA.Name = "ST_ENSIONA";
-            this.ST_ENSIONA.Negative = false;
-            this.ST_ENSIONA.Power = null;
-            this.ST_ENSIONA.Size = new System.Drawing.Size(178, 28);
-            this.ST_ENSIONA.Str = null;
-            this.ST_ENSIONA.Str1 = null;
-            this.ST_ENSIONA.Str2 = null;
-            this.ST_ENSIONA.TabIndex = 125;
-            // 
-            // ST_ENSIONA_label
-            // 
-            this.ST_ENSIONA_label.AutoSize = true;
-            this.ST_ENSIONA_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONA_label.Location = new System.Drawing.Point(207, 888);
-            this.ST_ENSIONA_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ST_ENSIONA_label.Name = "ST_ENSIONA_label";
-            this.ST_ENSIONA_label.Size = new System.Drawing.Size(31, 31);
-            this.ST_ENSIONA_label.TabIndex = 124;
-            this.ST_ENSIONA_label.Text = "A";
-            // 
-            // ST_ENSIONB
-            // 
-            this.ST_ENSIONB.AllPower = null;
-            this.ST_ENSIONB.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONB.ID = null;
-            this.ST_ENSIONB.Location = new System.Drawing.Point(540, 888);
-            this.ST_ENSIONB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ST_ENSIONB.Name = "ST_ENSIONB";
-            this.ST_ENSIONB.Negative = false;
-            this.ST_ENSIONB.Power = null;
-            this.ST_ENSIONB.Size = new System.Drawing.Size(178, 28);
-            this.ST_ENSIONB.Str = null;
-            this.ST_ENSIONB.Str1 = null;
-            this.ST_ENSIONB.Str2 = null;
-            this.ST_ENSIONB.TabIndex = 123;
-            // 
-            // ST_ENSIONB_label
-            // 
-            this.ST_ENSIONB_label.AutoSize = true;
-            this.ST_ENSIONB_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONB_label.Location = new System.Drawing.Point(500, 888);
-            this.ST_ENSIONB_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ST_ENSIONB_label.Name = "ST_ENSIONB_label";
-            this.ST_ENSIONB_label.Size = new System.Drawing.Size(29, 31);
-            this.ST_ENSIONB_label.TabIndex = 122;
-            this.ST_ENSIONB_label.Text = "B";
-            // 
-            // ST_ENSIONC
-            // 
-            this.ST_ENSIONC.AllPower = null;
-            this.ST_ENSIONC.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONC.ID = null;
-            this.ST_ENSIONC.Location = new System.Drawing.Point(838, 888);
-            this.ST_ENSIONC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ST_ENSIONC.Name = "ST_ENSIONC";
-            this.ST_ENSIONC.Negative = false;
-            this.ST_ENSIONC.Power = null;
-            this.ST_ENSIONC.Size = new System.Drawing.Size(178, 28);
-            this.ST_ENSIONC.Str = null;
-            this.ST_ENSIONC.Str1 = null;
-            this.ST_ENSIONC.Str2 = null;
-            this.ST_ENSIONC.TabIndex = 121;
-            // 
-            // ST_ENSIONC_label
-            // 
-            this.ST_ENSIONC_label.AutoSize = true;
-            this.ST_ENSIONC_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONC_label.Location = new System.Drawing.Point(798, 888);
-            this.ST_ENSIONC_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ST_ENSIONC_label.Name = "ST_ENSIONC_label";
-            this.ST_ENSIONC_label.Size = new System.Drawing.Size(30, 31);
-            this.ST_ENSIONC_label.TabIndex = 120;
-            this.ST_ENSIONC_label.Text = "C";
-            // 
-            // ST_ENSIOND
-            // 
-            this.ST_ENSIOND.AllPower = null;
-            this.ST_ENSIOND.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIOND.ID = null;
-            this.ST_ENSIOND.Location = new System.Drawing.Point(248, 928);
-            this.ST_ENSIOND.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ST_ENSIOND.Name = "ST_ENSIOND";
-            this.ST_ENSIOND.Negative = false;
-            this.ST_ENSIOND.Power = null;
-            this.ST_ENSIOND.Size = new System.Drawing.Size(178, 28);
-            this.ST_ENSIOND.Str = null;
-            this.ST_ENSIOND.Str1 = null;
-            this.ST_ENSIOND.Str2 = null;
-            this.ST_ENSIOND.TabIndex = 119;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(207, 928);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(32, 31);
-            this.label9.TabIndex = 118;
-            this.label9.Text = "D";
-            // 
-            // ST_ENSIONE
-            // 
-            this.ST_ENSIONE.AllPower = null;
-            this.ST_ENSIONE.BackColor = System.Drawing.Color.White;
-            this.ST_ENSIONE.ID = null;
-            this.ST_ENSIONE.Location = new System.Drawing.Point(540, 928);
-            this.ST_ENSIONE.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ST_ENSIONE.Name = "ST_ENSIONE";
-            this.ST_ENSIONE.Negative = false;
-            this.ST_ENSIONE.Power = null;
-            this.ST_ENSIONE.Size = new System.Drawing.Size(178, 28);
-            this.ST_ENSIONE.Str = null;
-            this.ST_ENSIONE.Str1 = null;
-            this.ST_ENSIONE.Str2 = null;
-            this.ST_ENSIONE.TabIndex = 117;
-            // 
-            // ST_ENSIONE_label
-            // 
-            this.ST_ENSIONE_label.AutoSize = true;
-            this.ST_ENSIONE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ST_ENSIONE_label.Location = new System.Drawing.Point(501, 928);
-            this.ST_ENSIONE_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ST_ENSIONE_label.Name = "ST_ENSIONE_label";
-            this.ST_ENSIONE_label.Size = new System.Drawing.Size(27, 31);
-            this.ST_ENSIONE_label.TabIndex = 116;
-            this.ST_ENSIONE_label.Text = "E";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(10, 888);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(194, 31);
-            this.label7.TabIndex = 115;
-            this.label7.Text = "张力测试结果(N)";
-            // 
-            // Scrap
-            // 
-            this.Scrap.AllPower = null;
-            this.Scrap.BackColor = System.Drawing.Color.Transparent;
-            this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
-            this.Scrap.Image = null;
-            this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(1173, 921);
-            this.Scrap.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
-            this.Scrap.Name = "Scrap";
-            this.Scrap.NormalImage = ((System.Drawing.Image)(resources.GetObject("Scrap.NormalImage")));
-            this.Scrap.Power = null;
-            this.Scrap.Size = new System.Drawing.Size(102, 42);
-            this.Scrap.TabIndex = 126;
-            this.Scrap.Text = "报废";
-            this.Scrap.UseVisualStyleBackColor = false;
-            this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
-            // 
-            // st_usecount
-            // 
-            this.st_usecount.AutoSize = true;
-            this.st_usecount.Location = new System.Drawing.Point(504, 792);
-            this.st_usecount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.st_usecount.Name = "st_usecount";
-            this.st_usecount.Size = new System.Drawing.Size(0, 18);
-            this.st_usecount.TabIndex = 127;
-            this.st_usecount.Visible = false;
-            // 
-            // su_stcode
-            // 
-            this.su_stcode.DataPropertyName = "su_stcode";
-            this.su_stcode.HeaderText = "钢网刮刀编号";
-            this.su_stcode.MinimumWidth = 10;
-            this.su_stcode.Name = "su_stcode";
-            this.su_stcode.Width = 200;
-            // 
-            // st_pcbcode
+            // st_pcbcode
             // 
             this.st_pcbcode.DataPropertyName = "st_pcbcode";
             this.st_pcbcode.HeaderText = "PCB料号";
@@ -734,7 +658,83 @@
             this.su_usemacode.HeaderText = "领用工单";
             this.su_usemacode.MinimumWidth = 10;
             this.su_usemacode.Name = "su_usemacode";
-            this.su_usemacode.Width = 116;
+            this.su_usemacode.Width = 91;
+            // 
+            // Confirm
+            // 
+            this.Confirm.AllPower = null;
+            this.Confirm.BackColor = System.Drawing.Color.Transparent;
+            this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
+            this.Confirm.Image = null;
+            this.Confirm.IsShowBorder = true;
+            this.Confirm.Location = new System.Drawing.Point(1242, 6);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
+            this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
+            this.Confirm.Name = "Confirm";
+            this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
+            this.Confirm.Power = null;
+            this.Confirm.Size = new System.Drawing.Size(102, 42);
+            this.Confirm.TabIndex = 75;
+            this.Confirm.Text = "确定";
+            this.Confirm.UseVisualStyleBackColor = false;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // li_code
+            // 
+            this.li_code.AllPower = null;
+            this.li_code.BackColor = System.Drawing.Color.White;
+            this.li_code.Caller = null;
+            this.li_code.Condition = null;
+            this.li_code.DBTitle = null;
+            this.li_code.FormName = null;
+            this.li_code.Location = new System.Drawing.Point(1028, 741);
+            this.li_code.Margin = new System.Windows.Forms.Padding(4);
+            this.li_code.Name = "li_code";
+            this.li_code.Power = null;
+            this.li_code.ReturnData = null;
+            this.li_code.SelectField = null;
+            this.li_code.SetValueField = null;
+            this.li_code.Size = new System.Drawing.Size(190, 32);
+            this.li_code.TabIndex = 74;
+            this.li_code.TableName = null;
+            this.li_code.TextBoxEnable = false;
+            // 
+            // ma_prodcode
+            // 
+            this.ma_prodcode.AllPower = null;
+            this.ma_prodcode.BackColor = System.Drawing.Color.White;
+            this.ma_prodcode.Enabled = false;
+            this.ma_prodcode.ID = null;
+            this.ma_prodcode.Location = new System.Drawing.Point(464, 14);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_prodcode.Name = "ma_prodcode";
+            this.ma_prodcode.Power = null;
+            this.ma_prodcode.Size = new System.Drawing.Size(208, 28);
+            this.ma_prodcode.Str = null;
+            this.ma_prodcode.Str1 = null;
+            this.ma_prodcode.Str2 = null;
+            this.ma_prodcode.TabIndex = 72;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(123, 14);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(212, 32);
+            this.ma_code.TabIndex = 71;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            this.ma_code.TextKeyDown += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
             // 
             // Make_SMTStencil
             // 
@@ -784,7 +784,7 @@
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_SMTStencil";
             this.Tag = "Make!SMTStencil";
             this.Text = "Make_SMTStencil";

UAS_MES_HYSX/FunctionCode/Make/Make_SMTStencil.cs

@@ -202,7 +202,7 @@ namespace UAS_MES_NEW.Make
         {
             if (string.IsNullOrEmpty(st_combinenumber.Text))
             {
-                MessageBox.Show("请维护加工小板数");
+                MessageBox.Show("请维护印刷次数");
                 return;
             }
             if (SU_RETURNIFCLEAN.Checked)

UAS_MES_HYSX/FunctionCode/Make/Make_SMTStencil.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Receive.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Scrap.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +130,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Receive.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Scrap.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -143,7 +143,7 @@
         gg==
 </value>
   </data>
-  <data name="Receive.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Scrap.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -156,7 +156,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Return.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Receive.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -168,7 +168,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Return.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Receive.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -181,7 +181,7 @@
         gg==
 </value>
   </data>
-  <data name="Return.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Receive.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -194,31 +194,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Return.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -230,7 +206,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Return.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -243,7 +219,7 @@
         gg==
 </value>
   </data>
-  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Return.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -256,7 +232,55 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Scrap.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -268,7 +292,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Scrap.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -281,7 +305,7 @@
         gg==
 </value>
   </data>
-  <data name="Scrap.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -294,28 +318,4 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS_MES_HYSX/FunctionCode/Make/Make_ThruputLog.Designer.cs

@@ -0,0 +1,257 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_ThruputLog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ExePath = new System.Windows.Forms.TextBox();
+            this.label19 = new System.Windows.Forms.Label();
+            this.Parse = new System.Windows.Forms.Button();
+            this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ExePath
+            // 
+            this.ExePath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ExePath.Location = new System.Drawing.Point(212, 179);
+            this.ExePath.Name = "ExePath";
+            this.ExePath.Size = new System.Drawing.Size(608, 31);
+            this.ExePath.TabIndex = 25;
+            this.ExePath.Click += new System.EventHandler(this.ExePath_Click);
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label19.Location = new System.Drawing.Point(29, 179);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(153, 28);
+            this.label19.TabIndex = 24;
+            this.label19.Text = "iperf 启动路径:";
+            // 
+            // Parse
+            // 
+            this.Parse.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Parse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Parse.Location = new System.Drawing.Point(685, 246);
+            this.Parse.Name = "Parse";
+            this.Parse.Size = new System.Drawing.Size(135, 39);
+            this.Parse.TabIndex = 91;
+            this.Parse.Text = "提取解析";
+            this.Parse.UseVisualStyleBackColor = true;
+            this.Parse.Click += new System.EventHandler(this.Parse_Click);
+            // 
+            // OperatResult
+            // 
+            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(0, 316);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(1600, 588);
+            this.OperatResult.TabIndex = 90;
+            this.OperatResult.Text = "";
+            // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Top;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.SNDetails.Location = new System.Drawing.Point(0, 0);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Size = new System.Drawing.Size(1600, 123);
+            this.SNDetails.TabIndex = 26;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "产品序列信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.19F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.81F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 37);
+            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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 83F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1594, 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(1005, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(586, 83);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(693, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(204, 83);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(399, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(186, 83);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(903, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(96, 83);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "产品名称: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            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(96, 83);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "序列号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(591, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(96, 83);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "产品编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(297, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(96, 83);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "工单: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(105, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(186, 83);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // Make_ThruputLog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1600, 900);
+            this.Controls.Add(this.Parse);
+            this.Controls.Add(this.OperatResult);
+            this.Controls.Add(this.SNDetails);
+            this.Controls.Add(this.ExePath);
+            this.Controls.Add(this.label19);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_ThruputLog";
+            this.Text = "Make_ThruputLog";
+            this.Load += new System.EventHandler(this.Make_ThruputLog_Load);
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox ExePath;
+        private System.Windows.Forms.Label label19;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder SNDetails;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label productName;
+        private System.Windows.Forms.Label productCode;
+        private System.Windows.Forms.Label workOrder;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label serialNumber;
+        private CustomControl.RichText.RichTextAutoBottom OperatResult;
+        private System.Windows.Forms.Button Parse;
+    }
+}

UAS_MES_HYSX/FunctionCode/Make/Make_ThruputLog.cs

@@ -0,0 +1,260 @@
+using NPOI.SS.Formula.Eval;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_ThruputLog : Form
+    {
+        public Make_ThruputLog()
+        {
+            InitializeComponent();
+        }
+
+        StringBuilder SQL = new StringBuilder();
+        DataTable dt;
+        DataHelper dh;
+
+        string sVal1, sVal2, rVal1, rVal2;
+
+        private void Make_ThruputLog_Load(object sender, EventArgs e)
+        {
+
+            dh = SystemInf.dh;
+        }
+
+        private void Parse_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(ExePath.Text))
+            {
+                ShowMsg(0, $"请选择测试使用的iperf3.exe");
+                return;
+            }
+            string passPath, failPath;
+
+            string parentPath = Path.GetDirectoryName(ExePath.Text.Trim());
+            string logsPath = Path.Combine(parentPath, "log");
+            passPath = Path.Combine(logsPath, "pass"); 
+            failPath = Path.Combine(logsPath, "fail");
+
+            string[] passFiles = Directory.GetFiles(passPath, $"*up.log");
+            foreach (string currLog in passFiles)
+            {
+                string upRes = ParseIperfBitrate(currLog);
+
+                string sn = Path.GetFileName(currLog).Split('_')[0];
+                SQL.Clear();
+                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
+                if (dt.Rows.Count == 0)
+                {
+                    ShowMsg(0, $"序列号无归属工单");
+                    continue;
+                }
+                string wo = dt.Rows[0]["ma_code"].ToString();
+                string logPath = Path.GetDirectoryName(currLog);
+                string downLog = Path.Combine(logPath, $"{sn}_down.log");
+
+                string downRes = ParseIperfBitrate(downLog);
+                string tDetail = $"upRate/{upRes};downRate/{downRes}";
+
+                CheckPassStation(wo, sn, "PASS", tDetail);
+            }
+
+            string[] failFiles = Directory.GetFiles(failPath, $"*up.log");
+            foreach (string currLog in failFiles)
+            {
+                string upRes = ParseIperfBitrate(currLog);
+                string sn = Path.GetFileName(currLog).Split('_')[0];
+                SQL.Clear();
+                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product WHERE ms_sncode = '{sn}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
+                if (dt.Rows.Count == 0)
+                {
+                    ShowMsg(0, $"序列号无归属工单");
+                    continue;
+                }
+                string wo = dt.Rows[0]["ma_code"].ToString();
+                string logPath = Path.GetDirectoryName(currLog);
+                string downLog = Path.Combine(logPath, $"{sn}_down.log");
+
+                string downRes = ParseIperfBitrate(downLog);
+                string tDetail = $"upRate/{upRes};downRate/{downRes}";
+
+                CheckPassStation(wo, sn, "PASS", tDetail);
+            }
+        }
+        private void CheckPassStation(string wo,string sn, string testRes, string testDetail)
+        {
+            List<string> param = new List<string>() { };
+            string outMsg = "";
+            param.Add(wo);
+            param.Add(sn);
+            param.Add(User.UserSourceCode);
+            param.Add(testRes);
+            param.Add("");
+            param.Add("");
+            param.Add("ThruputLog");
+            param.Add(testDetail);
+            param.Add(outMsg);
+            string[] paramList = param.ToArray();
+            dh.CallProcedure("cs_insert_testrejects", ref paramList);
+            if (paramList[8].Substring(0, 2) == "OK")
+            {
+                ShowMsg(1, $"序列号{sn}采集成功:测试结果为{testRes}");
+                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, workOrder.Text, User.UserLineCode, User.UserSourceCode, "无线吞吐量", "无线吞吐量过站成功", sn, "");
+            }
+
+            dt = (DataTable)dh.ExecuteSql($"SELECT mp_id FROM makeprocess WHERE mp_sncode = '{sn}' AND instr(mp_stepname, '吞吐量') > 0", "select");
+            if (dt.Rows.Count > 0)
+            {
+                ShowMsg(1, $"序列号:{sn}已经过站记录");
+                return;
+            }
+
+            string oWO, oWOId, oErrMsg = "";
+            if (LogicHandler.CheckStepSNAndMacode(workOrder.Text, User.UserSourceCode, sn, User.UserCode, out oWO, out oWOId, out oErrMsg))
+            {
+                if (LogicHandler.SetStepResult(oWO, User.UserSourceCode, sn, "无线吞吐量", "OK", User.UserCode, out oErrMsg))
+                {
+                    ShowMsg(0, $"序列号{sn},过站记录成功");
+                }
+                else
+                {
+                    ShowMsg(0, $"序列号{sn},处理过站NG:{oErrMsg}");
+                }
+            }
+            else
+            {
+                ShowMsg(0, $"序列号{sn},过站核对NG:{oErrMsg}");
+            }
+        }
+
+        public string ParseIperfBitrate(string logPath)
+        {
+            if (!File.Exists(logPath)) return "0.0";
+
+            var lines = File.ReadAllLines(logPath);
+            List<string> logItem = new List<string> { };
+            foreach (var line in lines)
+            {
+                //if (line.Trim().StartsWith("[SUM]"))
+                //{
+                //    logItem.Add(line);
+                //}
+
+                if(line.Contains("sender") || line.Contains("receiver"))
+                {
+                    logItem.Add(line);
+                }
+            }
+
+            if (logItem.Count > 0 && logItem[logItem.Count - 2].Contains("sender"))
+            {
+                var match = Regex.Match(logItem[logItem.Count - 2], @"(\d+\.\d+\s+MBytes).*?(\d+\.\d+\s+Mbits/sec)");
+                if (match.Success)
+                {
+                    sVal1 = match.Groups[1].Value;
+                    sVal2 = match.Groups[2].Value;
+                }
+            }
+            if (logItem.Count > 0 && logItem[logItem.Count - 1].Contains("receiver"))
+            {
+                var match = Regex.Match(logItem[logItem.Count - 1], @"(\d+\.\d+\s+MBytes).*?(\d+\.\d+\s+Mbits/sec)");
+                if (match.Success)
+                {
+                    rVal1 = match.Groups[1].Value;
+                    rVal2 = match.Groups[2].Value;
+                }
+            }
+            //double num1 = (double.Parse(sVal1.Split(' ')[0]) + double.Parse(rVal1.Split(' ')[0])) / 2;
+            //double num2 = (double.Parse(sVal2.Split(' ')[0]) + double.Parse(rVal2.Split(' ')[0])) / 2;
+
+            return rVal2;
+        }
+
+
+        private void ShowMsg(int type, string msg)
+        {
+            msg = msg.Replace("\r", "").Replace("\n", "");
+            string msgTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string showMsg = $"{msgTime}: {msg}\n";
+            if (type == 0)
+            {
+                OperatResult.AppendText(showMsg, Color.Red);
+            }
+            else if (type == 1)
+            {
+                OperatResult.AppendText(showMsg, Color.Green);
+            }
+        }
+
+        private void ExePath_Click(object sender, EventArgs e)
+        {
+            using (OpenFileDialog openFileDialog = new OpenFileDialog())
+            {
+                openFileDialog.Title = "选择iperf3启动文件";
+                openFileDialog.Filter = "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*";
+                openFileDialog.FilterIndex = 1;
+                openFileDialog.RestoreDirectory = true;
+
+                // 设置初始目录（可选）
+                if (!string.IsNullOrEmpty(ExePath.Text) && System.IO.File.Exists(ExePath.Text))
+                {
+                    openFileDialog.InitialDirectory = System.IO.Path.GetDirectoryName(ExePath.Text);
+                }
+                else
+                {
+                    openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+                }
+
+                if (openFileDialog.ShowDialog() == DialogResult.OK)
+                {
+                    ExePath.Text = openFileDialog.FileName;
+                    ShowMsg(1, $"已成功选择iperf3启动文件");
+                }
+            }
+        }
+
+        private void UpdateSN(string type, string sn)
+        {
+            if (type == "C")
+            {
+                serialNumber.Text = "";
+                workOrder.Text = "";
+                productCode.Text = "";
+                productName.Text = "";
+            }
+            else if (type == "L")
+            {
+                SQL.Clear();
+                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product
+                        WHERE ms_sncode = '{sn}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    serialNumber.Text = dt.Rows[0]["ms_sncode"].ToString();
+                    workOrder.Text = dt.Rows[0]["ma_code"].ToString();
+                    productCode.Text = dt.Rows[0]["pr_code"].ToString();
+                    productName.Text = dt.Rows[0]["pr_spec"].ToString();
+                }
+                else
+                {
+                    UpdateSN("C", sn);
+                }
+            }
+        }
+    }
+}

UAS_MES_HYSX/FunctionCode/Make/Make_ThruputLog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

UAS_MES_HYSX/FunctionCode/Make/Make_WirelessThroughput.cs

@@ -133,10 +133,10 @@ namespace UAS_MES_NEW.Make
             ResMax.Text = upRate;
             ResMin.Text = downRate;
             string tDetail = $"upRate/{upRate};downRate/{downRate}";
-            CheckPassStation(SN.Text, upRate, downRate, "PASS", tDetail);
+            CheckPassStation(SN.Text, "PASS", tDetail);
         }
 
-        private void CheckPassStation(string sn, string upRate, string downRate, string testRes,string testDetail)
+        private void CheckPassStation(string sn, string testRes,string testDetail)
         {
             List<string> param = new List<string>() { };
             string outMsg = "";
@@ -146,7 +146,7 @@ namespace UAS_MES_NEW.Make
             param.Add(testRes);
             param.Add("");
             param.Add("");
-            param.Add("WirelessThroughput");
+            param.Add("Thruput");
             param.Add(testDetail);
             param.Add(outMsg);
             string[] paramList = param.ToArray();

UAS_MES_HYSX/UAS_MES_HYSX.csproj

@@ -743,6 +743,12 @@
     <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.Designer.cs">
       <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_ThruputLog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ThruputLog.Designer.cs">
+      <DependentUpon>Make_ThruputLog.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_WirelessThroughput.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1730,6 +1736,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_DCW.resx">
       <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ThruputLog.resx">
+      <DependentUpon>Make_ThruputLog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_WirelessThroughput.resx">
       <DependentUpon>Make_WirelessThroughput.cs</DependentUpon>
     </EmbeddedResource>