Merge branch 'master' of ssh://10.10.101.21/source/mes-client

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

@@ -32,8 +32,6 @@
             this.pr_colorboxgw_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pr_colorboxunit = new System.Windows.Forms.Label();
-            this.pr_colorboxgw = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_code = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label22 = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
@@ -47,18 +45,6 @@
             this.PrintLabel_label = new System.Windows.Forms.Label();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
             this.label1 = new System.Windows.Forms.Label();
-            this.PrinterList = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.StopWeight = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.StartWeight = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.BaudRate = new System.Windows.Forms.Label();
             this.ComList = new System.Windows.Forms.Label();
             this.WeighRecord = new System.Windows.Forms.ListView();
@@ -66,7 +52,6 @@
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ob_checkno = new System.Windows.Forms.Label();
             this.ob_nowcheckqty = new System.Windows.Forms.Label();
@@ -74,6 +59,21 @@
             this.ob_nowcheckqty_label = new System.Windows.Forms.Label();
             this.ob_batchqty_label = new System.Windows.Forms.Label();
             this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.pr_colorboxgw = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
+            this.pr_code = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.PrinterList = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
+            this.StopWeight = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.StartWeight = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -114,33 +114,6 @@
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             // 
-            // pr_colorboxgw
-            // 
-            this.pr_colorboxgw.AutoSize = true;
-            this.pr_colorboxgw.CutLength = null;
-            this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(170, 349);
-            this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pr_colorboxgw.Name = "pr_colorboxgw";
-            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
-            this.pr_colorboxgw.TabIndex = 80;
-            this.pr_colorboxgw.Tag = "1";
-            // 
-            // pr_code
-            // 
-            this.pr_code.AutoSize = true;
-            this.pr_code.CutLength = null;
-            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(170, 420);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 32);
-            this.pr_code.TabIndex = 79;
-            this.pr_code.Tag = "1";
-            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
-            // 
             // label22
             // 
             this.label22.AutoSize = true;
@@ -288,10 +261,199 @@
             this.label1.TabIndex = 170;
             this.label1.Text = "打印张数";
             // 
+            // BaudRate
+            // 
+            this.BaudRate.AutoSize = true;
+            this.BaudRate.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BaudRate.Location = new System.Drawing.Point(1218, 40);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BaudRate.Name = "BaudRate";
+            this.BaudRate.Size = new System.Drawing.Size(100, 25);
+            this.BaudRate.TabIndex = 171;
+            this.BaudRate.Text = "BaudRate";
+            this.BaudRate.Visible = false;
+            // 
+            // ComList
+            // 
+            this.ComList.AutoSize = true;
+            this.ComList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ComList.Location = new System.Drawing.Point(1218, 8);
+            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ComList.Name = "ComList";
+            this.ComList.Size = new System.Drawing.Size(86, 25);
+            this.ComList.TabIndex = 172;
+            this.ComList.Text = "ComList";
+            this.ComList.Visible = false;
+            // 
+            // WeighRecord
+            // 
+            this.WeighRecord.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3,
+            this.columnHeader4});
+            this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.WeighRecord.Location = new System.Drawing.Point(540, 272);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.WeighRecord.Name = "WeighRecord";
+            this.WeighRecord.Size = new System.Drawing.Size(507, 416);
+            this.WeighRecord.TabIndex = 173;
+            this.WeighRecord.UseCompatibleStateImageBehavior = false;
+            this.WeighRecord.View = System.Windows.Forms.View.Details;
+            // 
+            // columnHeader1
+            // 
+            this.columnHeader1.Text = "";
+            this.columnHeader1.Width = 23;
+            // 
+            // columnHeader2
+            // 
+            this.columnHeader2.Text = "序列号";
+            this.columnHeader2.Width = 127;
+            // 
+            // columnHeader3
+            // 
+            this.columnHeader3.Text = "重量";
+            this.columnHeader3.Width = 99;
+            // 
+            // columnHeader4
+            // 
+            this.columnHeader4.Text = "时间";
+            this.columnHeader4.Width = 130;
+            // 
+            // groupBoxWithBorder2
+            // 
+            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.ob_checkno);
+            this.groupBoxWithBorder2.Controls.Add(this.ob_nowcheckqty);
+            this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty);
+            this.groupBoxWithBorder2.Controls.Add(this.ob_nowcheckqty_label);
+            this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty_label);
+            this.groupBoxWithBorder2.Controls.Add(this.SendCheck);
+            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(540, 97);
+            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(507, 154);
+            this.groupBoxWithBorder2.TabIndex = 175;
+            this.groupBoxWithBorder2.TabStop = false;
+            this.groupBoxWithBorder2.Text = "打印";
+            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
+            // 
+            // ob_checkno
+            // 
+            this.ob_checkno.AutoSize = true;
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_checkno.Location = new System.Drawing.Point(50, 112);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno.Name = "ob_checkno";
+            this.ob_checkno.Size = new System.Drawing.Size(0, 27);
+            this.ob_checkno.TabIndex = 179;
+            this.ob_checkno.Visible = false;
+            // 
+            // ob_nowcheckqty
+            // 
+            this.ob_nowcheckqty.AutoSize = true;
+            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(377, 54);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
+            this.ob_nowcheckqty.TabIndex = 178;
+            // 
+            // ob_batchqty
+            // 
+            this.ob_batchqty.AutoSize = true;
+            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_batchqty.Location = new System.Drawing.Point(148, 54);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty.Name = "ob_batchqty";
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
+            this.ob_batchqty.TabIndex = 177;
+            // 
+            // ob_nowcheckqty_label
+            // 
+            this.ob_nowcheckqty_label.AutoSize = true;
+            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(269, 54);
+            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_nowcheckqty_label.TabIndex = 176;
+            this.ob_nowcheckqty_label.Text = "当前批数";
+            // 
+            // ob_batchqty_label
+            // 
+            this.ob_batchqty_label.AutoSize = true;
+            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_batchqty_label.Location = new System.Drawing.Point(40, 54);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Name = "ob_batchqty_label";
+            this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_batchqty_label.TabIndex = 175;
+            this.ob_batchqty_label.Text = "标准批数";
+            // 
+            // SendCheck
+            // 
+            this.SendCheck.AllPower = "ifall";
+            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
+            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
+            this.SendCheck.Enabled = false;
+            this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.SendCheck.Image = null;
+            this.SendCheck.IsShowBorder = true;
+            this.SendCheck.Location = new System.Drawing.Point(396, 108);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
+            this.SendCheck.Name = "SendCheck";
+            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
+            this.SendCheck.Power = null;
+            this.SendCheck.Size = new System.Drawing.Size(80, 30);
+            this.SendCheck.TabIndex = 174;
+            this.SendCheck.Tag = "ifread";
+            this.SendCheck.Text = "送检";
+            this.SendCheck.UseVisualStyleBackColor = true;
+            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
+            // 
+            // pr_colorboxgw
+            // 
+            this.pr_colorboxgw.AutoSize = true;
+            this.pr_colorboxgw.CutLength = null;
+            this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_colorboxgw.Location = new System.Drawing.Point(170, 349);
+            this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_colorboxgw.Name = "pr_colorboxgw";
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
+            this.pr_colorboxgw.TabIndex = 80;
+            this.pr_colorboxgw.Tag = "1";
+            // 
+            // AutoPrint
+            // 
+            this.AutoPrint.Checked = false;
+            this.AutoPrint.Location = new System.Drawing.Point(1072, 27);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.AutoPrint.Name = "AutoPrint";
+            this.AutoPrint.Size = new System.Drawing.Size(112, 34);
+            this.AutoPrint.TabIndex = 174;
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.CutLength = null;
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_code.Location = new System.Drawing.Point(170, 420);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 32);
+            this.pr_code.TabIndex = 79;
+            this.pr_code.Tag = "1";
+            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
+            // 
             // PrinterList
             // 
             this.PrinterList.Location = new System.Drawing.Point(1211, 108);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrinterList.Name = "PrinterList";
             this.PrinterList.Size = new System.Drawing.Size(158, 25);
             this.PrinterList.TabIndex = 160;
@@ -466,166 +628,6 @@
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
-            // BaudRate
-            // 
-            this.BaudRate.AutoSize = true;
-            this.BaudRate.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate.Location = new System.Drawing.Point(1218, 40);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(100, 25);
-            this.BaudRate.TabIndex = 171;
-            this.BaudRate.Text = "BaudRate";
-            this.BaudRate.Visible = false;
-            // 
-            // ComList
-            // 
-            this.ComList.AutoSize = true;
-            this.ComList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(1218, 8);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(86, 25);
-            this.ComList.TabIndex = 172;
-            this.ComList.Text = "ComList";
-            this.ComList.Visible = false;
-            // 
-            // WeighRecord
-            // 
-            this.WeighRecord.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.columnHeader1,
-            this.columnHeader2,
-            this.columnHeader3,
-            this.columnHeader4});
-            this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.Location = new System.Drawing.Point(540, 272);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(507, 416);
-            this.WeighRecord.TabIndex = 173;
-            this.WeighRecord.UseCompatibleStateImageBehavior = false;
-            this.WeighRecord.View = System.Windows.Forms.View.Details;
-            // 
-            // columnHeader1
-            // 
-            this.columnHeader1.Text = "";
-            this.columnHeader1.Width = 23;
-            // 
-            // columnHeader2
-            // 
-            this.columnHeader2.Text = "序列号";
-            this.columnHeader2.Width = 127;
-            // 
-            // columnHeader3
-            // 
-            this.columnHeader3.Text = "重量";
-            this.columnHeader3.Width = 99;
-            // 
-            // columnHeader4
-            // 
-            this.columnHeader4.Text = "时间";
-            this.columnHeader4.Width = 130;
-            // 
-            // AutoPrint
-            // 
-            this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1072, 27);
-            this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(112, 34);
-            this.AutoPrint.TabIndex = 174;
-            // 
-            // groupBoxWithBorder2
-            // 
-            this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder2.Controls.Add(this.ob_checkno);
-            this.groupBoxWithBorder2.Controls.Add(this.ob_nowcheckqty);
-            this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty);
-            this.groupBoxWithBorder2.Controls.Add(this.ob_nowcheckqty_label);
-            this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty_label);
-            this.groupBoxWithBorder2.Controls.Add(this.SendCheck);
-            this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(540, 97);
-            this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(507, 154);
-            this.groupBoxWithBorder2.TabIndex = 175;
-            this.groupBoxWithBorder2.TabStop = false;
-            this.groupBoxWithBorder2.Text = "打印";
-            this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
-            // 
-            // ob_checkno
-            // 
-            this.ob_checkno.AutoSize = true;
-            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(50, 111);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 27);
-            this.ob_checkno.TabIndex = 179;
-            this.ob_checkno.Visible = false;
-            // 
-            // ob_nowcheckqty
-            // 
-            this.ob_nowcheckqty.AutoSize = true;
-            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(377, 53);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
-            this.ob_nowcheckqty.TabIndex = 178;
-            // 
-            // ob_batchqty
-            // 
-            this.ob_batchqty.AutoSize = true;
-            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(148, 53);
-            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
-            this.ob_batchqty.TabIndex = 177;
-            // 
-            // ob_nowcheckqty_label
-            // 
-            this.ob_nowcheckqty_label.AutoSize = true;
-            this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(269, 53);
-            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
-            this.ob_nowcheckqty_label.TabIndex = 176;
-            this.ob_nowcheckqty_label.Text = "当前批数";
-            // 
-            // ob_batchqty_label
-            // 
-            this.ob_batchqty_label.AutoSize = true;
-            this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(40, 53);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
-            this.ob_batchqty_label.TabIndex = 175;
-            this.ob_batchqty_label.Text = "标准批数";
-            // 
-            // SendCheck
-            // 
-            this.SendCheck.AllPower = "ifall";
-            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
-            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
-            this.SendCheck.Enabled = false;
-            this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.SendCheck.Image = null;
-            this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(396, 108);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
-            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
-            this.SendCheck.Name = "SendCheck";
-            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
-            this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(80, 30);
-            this.SendCheck.TabIndex = 174;
-            this.SendCheck.Tag = "ifread";
-            this.SendCheck.Text = "送检";
-            this.SendCheck.UseVisualStyleBackColor = true;
-            // 
             // Make_ColorBoxWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -34,6 +34,7 @@ namespace UAS_MES.Make
         Double MinWeight;
         //是否通过串口获取数据
         bool GetData = true;
+        string LastSncode;
 
         string ErrorMessage;
 
@@ -133,6 +134,8 @@ namespace UAS_MES.Make
                                 {
                                     LoadCheckQTY();
                                     OperateResult.AppendText(">>" + sncode.Text + "重量检测检测合格\n", Color.Green);
+                                    //记录送检前的最后一个序列号
+                                    LastSncode = sncode.Text;
                                     if (AutoPrint.Checked)
                                     {
                                         OperateResult.AppendText(">>打印条码号" + sncode.Text + "\n", Color.Green);
@@ -289,7 +292,7 @@ namespace UAS_MES.Make
             ob_nowcheckqty.ForeColor = Color.Black;
             SendCheck.Enabled = false;
             OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-            LogicHandler.InsertMakeProcess(sncode.Text, ms_makecode.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+            LogicHandler.InsertMakeProcess(LastSncode, ms_makecode.Text, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
             //记录操作日志
             LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
             ob_checkno.Text = "";

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.resx

@@ -118,6 +118,44 @@
     <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="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="SendCheck.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="SendCheck.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="StopWeight.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -771,44 +809,6 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="SendCheck.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="SendCheck.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

UAS_KanBan/Process.Designer.cs

@@ -67,11 +67,12 @@
             this.TopLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.TopLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.TopLine.DownBack = null;
-            this.TopLine.Location = new System.Drawing.Point(3, 22);
+            this.TopLine.Location = new System.Drawing.Point(4, 28);
+            this.TopLine.Margin = new System.Windows.Forms.Padding(4);
             this.TopLine.MouseBack = null;
             this.TopLine.Name = "TopLine";
             this.TopLine.NormlBack = null;
-            this.TopLine.Size = new System.Drawing.Size(1030, 2);
+            this.TopLine.Size = new System.Drawing.Size(1285, 2);
             this.TopLine.TabIndex = 0;
             // 
             // BottomLine
@@ -82,41 +83,40 @@
             this.BottomLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.BottomLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.BottomLine.DownBack = null;
-            this.BottomLine.Location = new System.Drawing.Point(3, 134);
+            this.BottomLine.Location = new System.Drawing.Point(4, 168);
+            this.BottomLine.Margin = new System.Windows.Forms.Padding(4);
             this.BottomLine.MouseBack = null;
             this.BottomLine.Name = "BottomLine";
             this.BottomLine.NormlBack = null;
-            this.BottomLine.Size = new System.Drawing.Size(1030, 2);
+            this.BottomLine.Size = new System.Drawing.Size(1285, 2);
             this.BottomLine.TabIndex = 1;
             // 
             // Line1
             // 
-            this.Line1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
             this.Line1.BackColor = System.Drawing.Color.White;
             this.Line1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line1.DownBack = null;
-            this.Line1.Location = new System.Drawing.Point(255, 23);
+            this.Line1.Location = new System.Drawing.Point(340, 29);
+            this.Line1.Margin = new System.Windows.Forms.Padding(4);
             this.Line1.MouseBack = null;
             this.Line1.Name = "Line1";
             this.Line1.NormlBack = null;
-            this.Line1.Size = new System.Drawing.Size(2, 112);
+            this.Line1.Size = new System.Drawing.Size(1, 139);
             this.Line1.TabIndex = 1;
             // 
             // Line2
             // 
-            this.Line2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.Line2.BackColor = System.Drawing.Color.White;
             this.Line2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line2.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line2.DownBack = null;
-            this.Line2.Location = new System.Drawing.Point(784, 23);
+            this.Line2.Location = new System.Drawing.Point(1020, 29);
+            this.Line2.Margin = new System.Windows.Forms.Padding(4);
             this.Line2.MouseBack = null;
             this.Line2.Name = "Line2";
             this.Line2.NormlBack = null;
-            this.Line2.Size = new System.Drawing.Size(2, 112);
+            this.Line2.Size = new System.Drawing.Size(1, 139);
             this.Line2.TabIndex = 3;
             // 
             // MidLine
@@ -127,11 +127,12 @@
             this.MidLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.MidLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.MidLine.DownBack = null;
-            this.MidLine.Location = new System.Drawing.Point(784, 81);
+            this.MidLine.Location = new System.Drawing.Point(1021, 101);
+            this.MidLine.Margin = new System.Windows.Forms.Padding(4);
             this.MidLine.MouseBack = null;
             this.MidLine.Name = "MidLine";
             this.MidLine.NormlBack = null;
-            this.MidLine.Size = new System.Drawing.Size(250, 2);
+            this.MidLine.Size = new System.Drawing.Size(268, 2);
             this.MidLine.TabIndex = 2;
             // 
             // Title
@@ -141,25 +142,26 @@
             this.Title.BackColor = System.Drawing.Color.Transparent;
             this.Title.BorderColor = System.Drawing.Color.White;
             this.Title.Font = new System.Drawing.Font("宋体", 45F);
-            this.Title.Location = new System.Drawing.Point(267, 49);
+            this.Title.Location = new System.Drawing.Point(356, 61);
+            this.Title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Title.Name = "Title";
-            this.Title.Size = new System.Drawing.Size(505, 60);
+            this.Title.Size = new System.Drawing.Size(632, 75);
             this.Title.TabIndex = 4;
             this.Title.Text = "产线执行进度看板";
             // 
             // Line3
             // 
-            this.Line3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.Line3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.Line3.BackColor = System.Drawing.Color.White;
             this.Line3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.Line3.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.Line3.DownBack = null;
-            this.Line3.Location = new System.Drawing.Point(895, 23);
+            this.Line3.Location = new System.Drawing.Point(1162, 29);
+            this.Line3.Margin = new System.Windows.Forms.Padding(4);
             this.Line3.MouseBack = null;
             this.Line3.Name = "Line3";
             this.Line3.NormlBack = null;
-            this.Line3.Size = new System.Drawing.Size(2, 112);
+            this.Line3.Size = new System.Drawing.Size(1, 139);
             this.Line3.TabIndex = 4;
             // 
             // 机型_label
@@ -169,10 +171,11 @@
             this.机型_label.AutoSize = true;
             this.机型_label.BackColor = System.Drawing.Color.Transparent;
             this.机型_label.BorderColor = System.Drawing.Color.White;
-            this.机型_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.机型_label.Location = new System.Drawing.Point(7, 265);
+            this.机型_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.机型_label.Location = new System.Drawing.Point(9, 331);
+            this.机型_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.机型_label.Name = "机型_label";
-            this.机型_label.Size = new System.Drawing.Size(314, 70);
+            this.机型_label.Size = new System.Drawing.Size(375, 84);
             this.机型_label.TabIndex = 6;
             this.机型_label.Tag = "AutoFont";
             this.机型_label.Text = "生产机型";
@@ -184,10 +187,11 @@
             this.产出_label.AutoSize = true;
             this.产出_label.BackColor = System.Drawing.Color.Transparent;
             this.产出_label.BorderColor = System.Drawing.Color.White;
-            this.产出_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.产出_label.Location = new System.Drawing.Point(7, 518);
+            this.产出_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.产出_label.Location = new System.Drawing.Point(9, 648);
+            this.产出_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.产出_label.Name = "产出_label";
-            this.产出_label.Size = new System.Drawing.Size(243, 70);
+            this.产出_label.Size = new System.Drawing.Size(290, 84);
             this.产出_label.TabIndex = 9;
             this.产出_label.Tag = "AutoFont";
             this.产出_label.Text = "总产出";
@@ -199,10 +203,11 @@
             this.投入_label.AutoSize = true;
             this.投入_label.BackColor = System.Drawing.Color.Transparent;
             this.投入_label.BorderColor = System.Drawing.Color.White;
-            this.投入_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.投入_label.Location = new System.Drawing.Point(7, 393);
+            this.投入_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.投入_label.Location = new System.Drawing.Point(9, 491);
+            this.投入_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.投入_label.Name = "投入_label";
-            this.投入_label.Size = new System.Drawing.Size(243, 70);
+            this.投入_label.Size = new System.Drawing.Size(290, 84);
             this.投入_label.TabIndex = 10;
             this.投入_label.Tag = "AutoFont";
             this.投入_label.Text = "总投入";
@@ -214,10 +219,11 @@
             this.收益率_label.AutoSize = true;
             this.收益率_label.BackColor = System.Drawing.Color.Transparent;
             this.收益率_label.BorderColor = System.Drawing.Color.White;
-            this.收益率_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.收益率_label.Location = new System.Drawing.Point(638, 393);
+            this.收益率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.收益率_label.Location = new System.Drawing.Point(792, 491);
+            this.收益率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率_label.Name = "收益率_label";
-            this.收益率_label.Size = new System.Drawing.Size(243, 70);
+            this.收益率_label.Size = new System.Drawing.Size(290, 84);
             this.收益率_label.TabIndex = 13;
             this.收益率_label.Tag = "AutoFont";
             this.收益率_label.Text = "收益率";
@@ -229,10 +235,11 @@
             this.故障数_label.AutoSize = true;
             this.故障数_label.BackColor = System.Drawing.Color.Transparent;
             this.故障数_label.BorderColor = System.Drawing.Color.White;
-            this.故障数_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.故障数_label.Location = new System.Drawing.Point(638, 518);
+            this.故障数_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.故障数_label.Location = new System.Drawing.Point(792, 648);
+            this.故障数_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数_label.Name = "故障数_label";
-            this.故障数_label.Size = new System.Drawing.Size(243, 70);
+            this.故障数_label.Size = new System.Drawing.Size(290, 84);
             this.故障数_label.TabIndex = 12;
             this.故障数_label.Tag = "AutoFont";
             this.故障数_label.Text = "故障数";
@@ -240,17 +247,18 @@
             // 直通率_label
             // 
             this.直通率_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.直通率_label.AutoSize = true;
             this.直通率_label.BackColor = System.Drawing.Color.Transparent;
             this.直通率_label.BorderColor = System.Drawing.Color.White;
-            this.直通率_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.直通率_label.Location = new System.Drawing.Point(638, 265);
+            this.直通率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
+            this.直通率_label.Location = new System.Drawing.Point(792, 331);
+            this.直通率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率_label.Name = "直通率_label";
-            this.直通率_label.Size = new System.Drawing.Size(243, 70);
+            this.直通率_label.Size = new System.Drawing.Size(460, 84);
             this.直通率_label.TabIndex = 11;
             this.直通率_label.Tag = "AutoFont";
-            this.直通率_label.Text = "直通率";
+            this.直通率_label.Text = "一次直通率";
             // 
             // LineCode_label
             // 
@@ -259,9 +267,10 @@
             this.LineCode_label.BackColor = System.Drawing.Color.Transparent;
             this.LineCode_label.BorderColor = System.Drawing.Color.White;
             this.LineCode_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.LineCode_label.Location = new System.Drawing.Point(792, 33);
+            this.LineCode_label.Location = new System.Drawing.Point(1032, 41);
+            this.LineCode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LineCode_label.Name = "LineCode_label";
-            this.LineCode_label.Size = new System.Drawing.Size(97, 40);
+            this.LineCode_label.Size = new System.Drawing.Size(122, 50);
             this.LineCode_label.TabIndex = 14;
             this.LineCode_label.Text = "线体";
             // 
@@ -272,9 +281,10 @@
             this.WorkShift_label.BackColor = System.Drawing.Color.Transparent;
             this.WorkShift_label.BorderColor = System.Drawing.Color.White;
             this.WorkShift_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.WorkShift_label.Location = new System.Drawing.Point(792, 88);
+            this.WorkShift_label.Location = new System.Drawing.Point(1032, 110);
+            this.WorkShift_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.WorkShift_label.Name = "WorkShift_label";
-            this.WorkShift_label.Size = new System.Drawing.Size(97, 40);
+            this.WorkShift_label.Size = new System.Drawing.Size(122, 50);
             this.WorkShift_label.TabIndex = 15;
             this.WorkShift_label.Text = "班次";
             // 
@@ -282,9 +292,10 @@
             // 
             this.Logo.BackColor = System.Drawing.Color.Transparent;
             this.Logo.Image = global::UAS_KanBan.Properties.Resources.lo3;
-            this.Logo.Location = new System.Drawing.Point(6, 31);
+            this.Logo.Location = new System.Drawing.Point(8, 39);
+            this.Logo.Margin = new System.Windows.Forms.Padding(4);
             this.Logo.Name = "Logo";
-            this.Logo.Size = new System.Drawing.Size(244, 95);
+            this.Logo.Size = new System.Drawing.Size(325, 119);
             this.Logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.Logo.TabIndex = 16;
             this.Logo.TabStop = false;
@@ -297,11 +308,12 @@
             this.投入.BackColor = System.Drawing.Color.Transparent;
             this.投入.BorderColor = System.Drawing.Color.Red;
             this.投入.BorderSize = 0;
-            this.投入.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.投入.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.投入.ForeColor = System.Drawing.Color.Red;
-            this.投入.Location = new System.Drawing.Point(340, 393);
+            this.投入.Location = new System.Drawing.Point(453, 491);
+            this.投入.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.投入.Name = "投入";
-            this.投入.Size = new System.Drawing.Size(0, 71);
+            this.投入.Size = new System.Drawing.Size(0, 87);
             this.投入.TabIndex = 19;
             this.投入.Tag = "AutoFont";
             // 
@@ -313,11 +325,12 @@
             this.产出.BackColor = System.Drawing.Color.Transparent;
             this.产出.BorderColor = System.Drawing.Color.Red;
             this.产出.BorderSize = 0;
-            this.产出.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.产出.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.产出.ForeColor = System.Drawing.Color.Red;
-            this.产出.Location = new System.Drawing.Point(340, 518);
+            this.产出.Location = new System.Drawing.Point(453, 648);
+            this.产出.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.产出.Name = "产出";
-            this.产出.Size = new System.Drawing.Size(0, 71);
+            this.产出.Size = new System.Drawing.Size(0, 87);
             this.产出.TabIndex = 18;
             this.产出.Tag = "AutoFont";
             // 
@@ -329,11 +342,12 @@
             this.收益率.BackColor = System.Drawing.Color.Transparent;
             this.收益率.BorderColor = System.Drawing.Color.Red;
             this.收益率.BorderSize = 0;
-            this.收益率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.收益率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.收益率.ForeColor = System.Drawing.Color.Red;
-            this.收益率.Location = new System.Drawing.Point(898, 393);
+            this.收益率.Location = new System.Drawing.Point(1138, 491);
+            this.收益率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率.Name = "收益率";
-            this.收益率.Size = new System.Drawing.Size(0, 71);
+            this.收益率.Size = new System.Drawing.Size(0, 87);
             this.收益率.TabIndex = 22;
             this.收益率.Tag = "AutoFont";
             // 
@@ -345,11 +359,12 @@
             this.故障数.BackColor = System.Drawing.Color.Transparent;
             this.故障数.BorderColor = System.Drawing.Color.Red;
             this.故障数.BorderSize = 0;
-            this.故障数.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.故障数.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.故障数.ForeColor = System.Drawing.Color.Red;
-            this.故障数.Location = new System.Drawing.Point(898, 518);
+            this.故障数.Location = new System.Drawing.Point(1138, 648);
+            this.故障数.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数.Name = "故障数";
-            this.故障数.Size = new System.Drawing.Size(0, 71);
+            this.故障数.Size = new System.Drawing.Size(0, 87);
             this.故障数.TabIndex = 21;
             this.故障数.Tag = "AutoFont";
             // 
@@ -361,11 +376,12 @@
             this.直通率.BackColor = System.Drawing.Color.Transparent;
             this.直通率.BorderColor = System.Drawing.Color.Red;
             this.直通率.BorderSize = 0;
-            this.直通率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
+            this.直通率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.直通率.ForeColor = System.Drawing.Color.Red;
-            this.直通率.Location = new System.Drawing.Point(898, 265);
+            this.直通率.Location = new System.Drawing.Point(1138, 331);
+            this.直通率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率.Name = "直通率";
-            this.直通率.Size = new System.Drawing.Size(0, 71);
+            this.直通率.Size = new System.Drawing.Size(0, 87);
             this.直通率.TabIndex = 20;
             this.直通率.Tag = "AutoFont";
             // 
@@ -377,9 +393,10 @@
             this.班次.BorderColor = System.Drawing.Color.Red;
             this.班次.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.班次.ForeColor = System.Drawing.Color.Red;
-            this.班次.Location = new System.Drawing.Point(909, 88);
+            this.班次.Location = new System.Drawing.Point(1179, 110);
+            this.班次.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.班次.Name = "班次";
-            this.班次.Size = new System.Drawing.Size(0, 40);
+            this.班次.Size = new System.Drawing.Size(0, 50);
             this.班次.TabIndex = 24;
             // 
             // Line
@@ -390,9 +407,10 @@
             this.Line.BorderColor = System.Drawing.Color.Red;
             this.Line.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Line.ForeColor = System.Drawing.Color.Red;
-            this.Line.Location = new System.Drawing.Point(909, 32);
+            this.Line.Location = new System.Drawing.Point(1180, 40);
+            this.Line.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Line.Name = "Line";
-            this.Line.Size = new System.Drawing.Size(0, 40);
+            this.Line.Size = new System.Drawing.Size(0, 50);
             this.Line.TabIndex = 23;
             // 
             // Title2
@@ -402,9 +420,10 @@
             this.Title2.BackColor = System.Drawing.Color.Transparent;
             this.Title2.BorderColor = System.Drawing.Color.White;
             this.Title2.Font = new System.Drawing.Font("宋体", 45F);
-            this.Title2.Location = new System.Drawing.Point(267, 161);
+            this.Title2.Location = new System.Drawing.Point(356, 201);
+            this.Title2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Title2.Name = "Title2";
-            this.Title2.Size = new System.Drawing.Size(535, 60);
+            this.Title2.Size = new System.Drawing.Size(670, 75);
             this.Title2.TabIndex = 25;
             this.Title2.Text = "投入\\产出实时统计";
             // 
@@ -414,20 +433,21 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.机型.AutoSize = true;
             this.机型.BackColor = System.Drawing.Color.Transparent;
-            this.机型.Font = new System.Drawing.Font("宋体", 52.25F, System.Drawing.FontStyle.Bold);
+            this.机型.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.机型.ForeColor = System.Drawing.Color.Red;
-            this.机型.Location = new System.Drawing.Point(340, 265);
+            this.机型.Location = new System.Drawing.Point(453, 331);
+            this.机型.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.机型.Name = "机型";
-            this.机型.Size = new System.Drawing.Size(0, 70);
+            this.机型.Size = new System.Drawing.Size(0, 87);
             this.机型.TabIndex = 17;
             this.机型.Tag = "AutoFont";
             // 
             // Process
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1036, 687);
+            this.ClientSize = new System.Drawing.Size(1292, 859);
             this.Controls.Add(this.Title2);
             this.Controls.Add(this.班次);
             this.Controls.Add(this.Line);
@@ -456,6 +476,7 @@
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Process";
             this.Text = "";
             this.TitleColor = System.Drawing.Color.WhiteSmoke;
@@ -465,7 +486,7 @@
             this.SizeChanged += new System.EventHandler(this.Process_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Process_KeyDown);
             ((System.ComponentModel.ISupportInitialize)(this.Logo)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS_KanBan/Process.cs

@@ -14,7 +14,7 @@ namespace UAS_KanBan
     public partial class Process : BaseForm
     {
 
-        AutoSizeControl asc = new AutoSizeControl();
+        AutoSizeFormClass asc = new AutoSizeFormClass();
 
         DataHelper dh = new DataHelper();
 
@@ -41,7 +41,7 @@ namespace UAS_KanBan
 
         private void Process_Load(object sender, EventArgs e)
         {
-            asc.InitControl(this);
+            asc.controllInitializeSize(this);
             Refresh_Tick(sender, e);
             Refresh.Tick += Refresh_Tick;
             Refresh.Interval = Setting.RefreshRate * 1000;
@@ -79,7 +79,10 @@ namespace UAS_KanBan
 
         private void Process_SizeChanged(object sender, EventArgs e)
         {
-            asc.AutoSize(this);
+            asc.controlAutoSize(this);
+            Line1.Size = new Size(2,BottomLine.Location.Y-TopLine.Location.Y);
+            Line2.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
+            Line3.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
             Title.Location = new Point(Line1.Location.X + (Line2.Location.X - Line1.Location.X - Title.Size.Width) / 2, TopLine.Location.Y + (BottomLine.Location.Y - TopLine.Location.Y - Title.Size.Height) / 2);
             Title2.Location = new Point(Title.Location.X, Title2.Location.Y);
             WorkShift_label.Location = new Point(Line2.Location.X + (Line3.Location.X - Line2.Location.X - WorkShift_label.Size.Width) / 2, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
@@ -87,13 +90,13 @@ namespace UAS_KanBan
             Line.Location = new Point(Line.Location.X, TopLine.Location.Y + (MidLine.Location.Y - TopLine.Location.Y - LineCode_label.Size.Height) / 2);
             班次.Location = new Point(班次.Location.X, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
             Logo.Size = new Size(Line1.Location.X - 20, BottomLine.Location.Y - TopLine.Location.Y - 20);
-            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 30, 机型_label.Location.Y);
-            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 30, 投入_label.Location.Y);
-            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 30, 产出_label.Location.Y);
-            直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 30, 直通率_label.Location.Y);
-            收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 30, 收益率_label.Location.Y);
-            故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 30, 故障数_label.Location.Y);
-            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width-40, 0);
+            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 5, 机型_label.Location.Y);
+            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 5, 投入_label.Location.Y);
+            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 5, 产出_label.Location.Y);
+            直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 5, 直通率_label.Location.Y);
+            收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 5, 收益率_label.Location.Y);
+            故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 5, 故障数_label.Location.Y);
+            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width-15, 0);
         }
 
         private void Process_FormClosing(object sender, FormClosingEventArgs e)

UAS_KanBan/Process.resx

@@ -121,7 +121,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>62</value>
+    <value>64</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">