2864

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs

@@ -1,34 +1,33 @@
-namespace ButcherFactory.SegmentProductionAuto_
-{
-  partial class SegmentProductionAutoForm
-  {
-    /// <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.components = new System.ComponentModel.Container();
+namespace ButcherFactory.SegmentProductionAuto_
+{
+  partial class SegmentProductionAutoForm
+  {
+    /// <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()
+    {
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -64,16 +63,9 @@
       this.groupBox1 = new System.Windows.Forms.GroupBox();
       this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel();
       this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
-      this.timer1 = new System.Windows.Forms.Timer(this.components);
-      this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
-      this.weightSwitch = new ButcherFactory.Controls.ColorButton();
-      this.zeroBtn = new ButcherFactory.Controls.ColorButton();
-      this.roundPanel2 = new ButcherFactory.Controls.RoundPanel(this.components);
-      this.labelStable = new System.Windows.Forms.Label();
-      this.labelZero = new System.Windows.Forms.Label();
-      this.lblChengZhong = new System.Windows.Forms.Label();
       this.logBtn = new ButcherFactory.Controls.ColorButton();
       this.closeBtn = new ButcherFactory.Controls.ColorButton();
+      this.uWeightControl1 = new ButcherFactory.Controls.WeightControl();
       this.goodsSetBtn = new ButcherFactory.Controls.ColorButton();
       this.colorButton2 = new ButcherFactory.Controls.ColorButton();
       this.viewTaskBtn = new ButcherFactory.Controls.ColorButton();
@@ -91,7 +83,6 @@
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
       this.groupBox1.SuspendLayout();
-      this.roundPanel2.SuspendLayout();
       this.SuspendLayout();
       // 
       // uLabel3
@@ -99,19 +90,21 @@
       this.uLabel3.AutoSize = true;
       this.uLabel3.BackColor = System.Drawing.Color.White;
       this.uLabel3.Font = new System.Drawing.Font("宋体", 12F);
-      this.uLabel3.Location = new System.Drawing.Point(8, 0);
+      this.uLabel3.Location = new System.Drawing.Point(11, 0);
+      this.uLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uLabel3.Name = "uLabel3";
-      this.uLabel3.Size = new System.Drawing.Size(71, 16);
+      this.uLabel3.Size = new System.Drawing.Size(89, 20);
       this.uLabel3.TabIndex = 1;
       this.uLabel3.Text = "生产历史";
       // 
       // groupBox2
       // 
       this.groupBox2.Controls.Add(this.taskDataGrid);
-      this.groupBox2.Location = new System.Drawing.Point(3, 3);
+      this.groupBox2.Location = new System.Drawing.Point(4, 4);
+      this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
-      this.groupBox2.Size = new System.Drawing.Size(452, 120);
+      this.groupBox2.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
+      this.groupBox2.Size = new System.Drawing.Size(603, 150);
       this.groupBox2.TabIndex = 4;
       this.groupBox2.TabStop = false;
       // 
@@ -137,25 +130,29 @@
             this.T_Done,
             this.T_Last});
       this.taskDataGrid.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.taskDataGrid.Location = new System.Drawing.Point(5, 19);
+      this.taskDataGrid.Location = new System.Drawing.Point(7, 24);
+      this.taskDataGrid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.taskDataGrid.MultiSelect = false;
       this.taskDataGrid.Name = "taskDataGrid";
       this.taskDataGrid.ReadOnly = true;
       this.taskDataGrid.RowHeadersVisible = false;
+      this.taskDataGrid.RowHeadersWidth = 51;
       dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
       this.taskDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
       this.taskDataGrid.RowTemplate.Height = 23;
       this.taskDataGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.taskDataGrid.Size = new System.Drawing.Size(442, 96);
+      this.taskDataGrid.Size = new System.Drawing.Size(589, 120);
       this.taskDataGrid.TabIndex = 2;
       // 
       // T_Item
       // 
       this.T_Item.DataPropertyName = "Item";
       this.T_Item.HeaderText = "项目";
+      this.T_Item.MinimumWidth = 6;
       this.T_Item.Name = "T_Item";
       this.T_Item.ReadOnly = true;
+      this.T_Item.Width = 125;
       // 
       // T_Need
       // 
@@ -164,6 +161,7 @@
       dataGridViewCellStyle3.Format = "#0.######";
       this.T_Need.DefaultCellStyle = dataGridViewCellStyle3;
       this.T_Need.HeaderText = "订货";
+      this.T_Need.MinimumWidth = 6;
       this.T_Need.Name = "T_Need";
       this.T_Need.ReadOnly = true;
       // 
@@ -174,6 +172,7 @@
       dataGridViewCellStyle4.Format = "#0.######";
       this.T_Done.DefaultCellStyle = dataGridViewCellStyle4;
       this.T_Done.HeaderText = "完工";
+      this.T_Done.MinimumWidth = 6;
       this.T_Done.Name = "T_Done";
       this.T_Done.ReadOnly = true;
       // 
@@ -184,6 +183,7 @@
       dataGridViewCellStyle5.Format = "#0.######";
       this.T_Last.DefaultCellStyle = dataGridViewCellStyle5;
       this.T_Last.HeaderText = "剩余";
+      this.T_Last.MinimumWidth = 6;
       this.T_Last.Name = "T_Last";
       this.T_Last.ReadOnly = true;
       // 
@@ -193,9 +193,10 @@
       this.GoodsLabel.BackColor = System.Drawing.Color.White;
       this.GoodsLabel.Font = new System.Drawing.Font("宋体", 12F);
       this.GoodsLabel.ForeColor = System.Drawing.Color.Blue;
-      this.GoodsLabel.Location = new System.Drawing.Point(144, 178);
+      this.GoodsLabel.Location = new System.Drawing.Point(192, 222);
+      this.GoodsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.GoodsLabel.Name = "GoodsLabel";
-      this.GoodsLabel.Size = new System.Drawing.Size(71, 16);
+      this.GoodsLabel.Size = new System.Drawing.Size(89, 20);
       this.GoodsLabel.TabIndex = 1;
       this.GoodsLabel.Text = "存货名称";
       // 
@@ -206,14 +207,12 @@
       this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.splitContainer1.IsSplitterFixed = true;
       this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.splitContainer1.Name = "splitContainer1";
       this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.weightSwitch);
-      this.splitContainer1.Panel1.Controls.Add(this.zeroBtn);
-      this.splitContainer1.Panel1.Controls.Add(this.roundPanel2);
       this.splitContainer1.Panel1.Controls.Add(this.butcherDateBox);
       this.splitContainer1.Panel1.Controls.Add(this.label3);
       this.splitContainer1.Panel1.Controls.Add(this.numberInput);
@@ -223,6 +222,7 @@
       this.splitContainer1.Panel1.Controls.Add(this.logBtn);
       this.splitContainer1.Panel1.Controls.Add(this.msglbl);
       this.splitContainer1.Panel1.Controls.Add(this.closeBtn);
+      this.splitContainer1.Panel1.Controls.Add(this.uWeightControl1);
       this.splitContainer1.Panel1.Controls.Add(this.barPrintCheck);
       this.splitContainer1.Panel1.Controls.Add(this.uTimerLabel1);
       this.splitContainer1.Panel1.Controls.Add(this.productBatchSelect);
@@ -234,8 +234,9 @@
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-      this.splitContainer1.Size = new System.Drawing.Size(1226, 704);
-      this.splitContainer1.SplitterDistance = 87;
+      this.splitContainer1.Size = new System.Drawing.Size(1635, 880);
+      this.splitContainer1.SplitterDistance = 100;
+      this.splitContainer1.SplitterWidth = 5;
       this.splitContainer1.TabIndex = 1;
       // 
       // butcherDateBox
@@ -243,9 +244,10 @@
       this.butcherDateBox.BackColor = System.Drawing.Color.Transparent;
       this.butcherDateBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
       this.butcherDateBox.Font = new System.Drawing.Font("宋体", 15F);
-      this.butcherDateBox.Location = new System.Drawing.Point(502, 15);
+      this.butcherDateBox.Location = new System.Drawing.Point(669, 19);
+      this.butcherDateBox.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.butcherDateBox.Name = "butcherDateBox";
-      this.butcherDateBox.Size = new System.Drawing.Size(115, 30);
+      this.butcherDateBox.Size = new System.Drawing.Size(153, 37);
       this.butcherDateBox.TabIndex = 35;
       this.butcherDateBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
       this.butcherDateBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.butcherDateBox_MouseClick);
@@ -254,18 +256,20 @@
       // 
       this.label3.AutoSize = true;
       this.label3.Font = new System.Drawing.Font("宋体", 15F);
-      this.label3.Location = new System.Drawing.Point(400, 21);
+      this.label3.Location = new System.Drawing.Point(533, 26);
+      this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(109, 20);
+      this.label3.Size = new System.Drawing.Size(137, 25);
       this.label3.TabIndex = 30;
       this.label3.Text = "屠宰日期：";
       // 
       // numberInput
       // 
       this.numberInput.Font = new System.Drawing.Font("宋体", 15F);
-      this.numberInput.Location = new System.Drawing.Point(680, 47);
+      this.numberInput.Location = new System.Drawing.Point(907, 59);
+      this.numberInput.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.numberInput.Name = "numberInput";
-      this.numberInput.Size = new System.Drawing.Size(115, 30);
+      this.numberInput.Size = new System.Drawing.Size(152, 36);
       this.numberInput.TabIndex = 29;
       this.numberInput.Text = "1";
       this.numberInput.MouseClick += new System.Windows.Forms.MouseEventHandler(this.numberInput_MouseClick);
@@ -274,18 +278,20 @@
       // 
       this.label2.AutoSize = true;
       this.label2.Font = new System.Drawing.Font("宋体", 15F);
-      this.label2.Location = new System.Drawing.Point(623, 51);
+      this.label2.Location = new System.Drawing.Point(831, 64);
+      this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(69, 20);
+      this.label2.Size = new System.Drawing.Size(87, 25);
       this.label2.TabIndex = 28;
       this.label2.Text = "数量：";
       // 
       // statisticNumberBox
       // 
       this.statisticNumberBox.Font = new System.Drawing.Font("宋体", 15F);
-      this.statisticNumberBox.Location = new System.Drawing.Point(502, 47);
+      this.statisticNumberBox.Location = new System.Drawing.Point(669, 59);
+      this.statisticNumberBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.statisticNumberBox.Name = "statisticNumberBox";
-      this.statisticNumberBox.Size = new System.Drawing.Size(115, 30);
+      this.statisticNumberBox.Size = new System.Drawing.Size(152, 36);
       this.statisticNumberBox.TabIndex = 27;
       this.statisticNumberBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.StatisticNumberBox_MouseClick);
       // 
@@ -293,9 +299,10 @@
       // 
       this.label1.AutoSize = true;
       this.label1.Font = new System.Drawing.Font("宋体", 15F);
-      this.label1.Location = new System.Drawing.Point(400, 51);
+      this.label1.Location = new System.Drawing.Point(533, 64);
+      this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(109, 20);
+      this.label1.Size = new System.Drawing.Size(137, 25);
       this.label1.TabIndex = 26;
       this.label1.Text = "统计数量：";
       // 
@@ -303,9 +310,10 @@
       // 
       this.msglbl.AutoSize = true;
       this.msglbl.ForeColor = System.Drawing.Color.Red;
-      this.msglbl.Location = new System.Drawing.Point(388, 6);
+      this.msglbl.Location = new System.Drawing.Point(517, 8);
+      this.msglbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.msglbl.Name = "msglbl";
-      this.msglbl.Size = new System.Drawing.Size(101, 12);
+      this.msglbl.Size = new System.Drawing.Size(127, 15);
       this.msglbl.TabIndex = 24;
       this.msglbl.Text = "";
       // 
@@ -313,9 +321,10 @@
       // 
       this.barPrintCheck.AutoSize = true;
       this.barPrintCheck.Font = new System.Drawing.Font("宋体", 15F);
-      this.barPrintCheck.Location = new System.Drawing.Point(292, 50);
+      this.barPrintCheck.Location = new System.Drawing.Point(389, 62);
+      this.barPrintCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.barPrintCheck.Name = "barPrintCheck";
-      this.barPrintCheck.Size = new System.Drawing.Size(108, 24);
+      this.barPrintCheck.Size = new System.Drawing.Size(134, 29);
       this.barPrintCheck.TabIndex = 16;
       this.barPrintCheck.Text = "启用打码";
       this.barPrintCheck.UseVisualStyleBackColor = true;
@@ -327,9 +336,10 @@
       this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent;
       this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F);
       this.uTimerLabel1.Format = "M月d日 H:mm:ss";
-      this.uTimerLabel1.Location = new System.Drawing.Point(1084, 53);
+      this.uTimerLabel1.Location = new System.Drawing.Point(1446, 66);
+      this.uTimerLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uTimerLabel1.Name = "uTimerLabel1";
-      this.uTimerLabel1.Size = new System.Drawing.Size(135, 16);
+      this.uTimerLabel1.Size = new System.Drawing.Size(169, 20);
       this.uTimerLabel1.TabIndex = 14;
       this.uTimerLabel1.Text = "4月21日 16:32:19";
       // 
@@ -338,9 +348,10 @@
       this.productBatchSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.productBatchSelect.Font = new System.Drawing.Font("宋体", 15F);
       this.productBatchSelect.FormattingEnabled = true;
-      this.productBatchSelect.Location = new System.Drawing.Point(903, 47);
+      this.productBatchSelect.Location = new System.Drawing.Point(1205, 59);
+      this.productBatchSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.productBatchSelect.Name = "productBatchSelect";
-      this.productBatchSelect.Size = new System.Drawing.Size(170, 28);
+      this.productBatchSelect.Size = new System.Drawing.Size(225, 33);
       this.productBatchSelect.TabIndex = 11;
       // 
       // workUnitSelect
@@ -348,9 +359,10 @@
       this.workUnitSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.workUnitSelect.Font = new System.Drawing.Font("宋体", 15F);
       this.workUnitSelect.FormattingEnabled = true;
-      this.workUnitSelect.Location = new System.Drawing.Point(903, 11);
+      this.workUnitSelect.Location = new System.Drawing.Point(1205, 14);
+      this.workUnitSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.workUnitSelect.Name = "workUnitSelect";
-      this.workUnitSelect.Size = new System.Drawing.Size(170, 28);
+      this.workUnitSelect.Size = new System.Drawing.Size(225, 33);
       this.workUnitSelect.TabIndex = 10;
       // 
       // uLabel1
@@ -359,9 +371,10 @@
       this.uLabel1.AutoSize = true;
       this.uLabel1.BackColor = System.Drawing.Color.Transparent;
       this.uLabel1.Font = new System.Drawing.Font("宋体", 15F);
-      this.uLabel1.Location = new System.Drawing.Point(802, 14);
+      this.uLabel1.Location = new System.Drawing.Point(1070, 18);
+      this.uLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uLabel1.Name = "uLabel1";
-      this.uLabel1.Size = new System.Drawing.Size(109, 20);
+      this.uLabel1.Size = new System.Drawing.Size(137, 25);
       this.uLabel1.TabIndex = 12;
       this.uLabel1.Text = "工作单元：";
       // 
@@ -371,18 +384,20 @@
       this.uLabel2.AutoSize = true;
       this.uLabel2.BackColor = System.Drawing.Color.Transparent;
       this.uLabel2.Font = new System.Drawing.Font("宋体", 15F);
-      this.uLabel2.Location = new System.Drawing.Point(802, 50);
+      this.uLabel2.Location = new System.Drawing.Point(1070, 62);
+      this.uLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uLabel2.Name = "uLabel2";
-      this.uLabel2.Size = new System.Drawing.Size(109, 20);
+      this.uLabel2.Size = new System.Drawing.Size(137, 25);
       this.uLabel2.TabIndex = 13;
       this.uLabel2.Text = "生产批次：";
       // 
       // netStateWatch1
       // 
       this.netStateWatch1.BackColor = System.Drawing.Color.Transparent;
-      this.netStateWatch1.Location = new System.Drawing.Point(292, 2);
+      this.netStateWatch1.Location = new System.Drawing.Point(389, 2);
+      this.netStateWatch1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
       this.netStateWatch1.Name = "netStateWatch1";
-      this.netStateWatch1.Size = new System.Drawing.Size(90, 39);
+      this.netStateWatch1.Size = new System.Drawing.Size(120, 49);
       this.netStateWatch1.TabIndex = 1;
       // 
       // splitContainer2
@@ -391,6 +406,7 @@
       this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
       this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
       this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.splitContainer2.Name = "splitContainer2";
       // 
       // splitContainer2.Panel1
@@ -409,8 +425,9 @@
       this.splitContainer2.Panel2.Controls.Add(this.rePrintBtn);
       this.splitContainer2.Panel2.Controls.Add(this.groupBox1);
       this.splitContainer2.Panel2.Controls.Add(this.groupBox2);
-      this.splitContainer2.Size = new System.Drawing.Size(1226, 613);
-      this.splitContainer2.SplitterDistance = 761;
+      this.splitContainer2.Size = new System.Drawing.Size(1635, 775);
+      this.splitContainer2.SplitterDistance = 1022;
+      this.splitContainer2.SplitterWidth = 5;
       this.splitContainer2.TabIndex = 0;
       // 
       // flowLayoutPanel2
@@ -420,9 +437,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.flowLayoutPanel2.AutoScroll = true;
       this.flowLayoutPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.flowLayoutPanel2.Location = new System.Drawing.Point(-1, 75);
+      this.flowLayoutPanel2.Location = new System.Drawing.Point(-1, 94);
+      this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.flowLayoutPanel2.Name = "flowLayoutPanel2";
-      this.flowLayoutPanel2.Size = new System.Drawing.Size(757, 536);
+      this.flowLayoutPanel2.Size = new System.Drawing.Size(1037, 679);
       this.flowLayoutPanel2.TabIndex = 24;
       // 
       // flowLayoutPanel1
@@ -431,8 +449,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
       this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1);
+      this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-      this.flowLayoutPanel1.Size = new System.Drawing.Size(640, 70);
+      this.flowLayoutPanel1.Size = new System.Drawing.Size(881, 87);
       this.flowLayoutPanel1.TabIndex = 22;
       // 
       // groupBox1
@@ -442,10 +461,11 @@
       this.groupBox1.Controls.Add(this.flowLayoutPanel4);
       this.groupBox1.Controls.Add(this.flowLayoutPanel3);
       this.groupBox1.Controls.Add(this.uLabel3);
-      this.groupBox1.Location = new System.Drawing.Point(8, 222);
+      this.groupBox1.Location = new System.Drawing.Point(11, 278);
+      this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
-      this.groupBox1.Size = new System.Drawing.Size(447, 381);
+      this.groupBox1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
+      this.groupBox1.Size = new System.Drawing.Size(596, 485);
       this.groupBox1.TabIndex = 5;
       this.groupBox1.TabStop = false;
       // 
@@ -455,9 +475,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.flowLayoutPanel4.AutoScroll = true;
-      this.flowLayoutPanel4.Location = new System.Drawing.Point(5, 90);
+      this.flowLayoutPanel4.Location = new System.Drawing.Point(7, 112);
+      this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.flowLayoutPanel4.Name = "flowLayoutPanel4";
-      this.flowLayoutPanel4.Size = new System.Drawing.Size(437, 286);
+      this.flowLayoutPanel4.Size = new System.Drawing.Size(583, 367);
       this.flowLayoutPanel4.TabIndex = 5;
       // 
       // flowLayoutPanel3
@@ -465,114 +486,24 @@
       this.flowLayoutPanel3.AutoScroll = true;
       this.flowLayoutPanel3.BackColor = System.Drawing.Color.White;
       this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Top;
-      this.flowLayoutPanel3.Location = new System.Drawing.Point(5, 19);
+      this.flowLayoutPanel3.Location = new System.Drawing.Point(7, 24);
       this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
       this.flowLayoutPanel3.Name = "flowLayoutPanel3";
-      this.flowLayoutPanel3.Size = new System.Drawing.Size(437, 68);
+      this.flowLayoutPanel3.Size = new System.Drawing.Size(582, 85);
       this.flowLayoutPanel3.TabIndex = 4;
       this.flowLayoutPanel3.WrapContents = false;
       // 
-      // timer1
-      // 
-      this.timer1.Interval = 50;
-      this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-      // 
-      // serialPort1
-      // 
-      this.serialPort1.PortName = "COM3";
-      // 
-      // weightSwitch
-      // 
-      this.weightSwitch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
-      this.weightSwitch.Font = new System.Drawing.Font("宋体", 10F);
-      this.weightSwitch.ForeColor = System.Drawing.Color.White;
-      this.weightSwitch.Location = new System.Drawing.Point(173, 43);
-      this.weightSwitch.Name = "weightSwitch";
-      this.weightSwitch.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.weightSwitch.Size = new System.Drawing.Size(90, 32);
-      this.weightSwitch.StateHold = true;
-      this.weightSwitch.TabIndex = 38;
-      this.weightSwitch.Text = "启用称重";
-      this.weightSwitch.UseVisualStyleBackColor = false;
-      this.weightSwitch.Click += new System.EventHandler(this.weightSwitch_Click);
-      // 
-      // zeroBtn
-      // 
-      this.zeroBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(144)))), ((int)(((byte)(98)))), ((int)(((byte)(222)))));
-      this.zeroBtn.Font = new System.Drawing.Font("宋体", 10F);
-      this.zeroBtn.ForeColor = System.Drawing.Color.White;
-      this.zeroBtn.Location = new System.Drawing.Point(173, 4);
-      this.zeroBtn.Name = "zeroBtn";
-      this.zeroBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.zeroBtn.Size = new System.Drawing.Size(90, 32);
-      this.zeroBtn.TabIndex = 37;
-      this.zeroBtn.Text = "归零";
-      this.zeroBtn.UseVisualStyleBackColor = false;
-      this.zeroBtn.Click += new System.EventHandler(this.zeroBtn_Click);
-      // 
-      // roundPanel2
-      // 
-      this.roundPanel2._setRoundRadius = 15;
-      this.roundPanel2.BackColor = System.Drawing.Color.Black;
-      this.roundPanel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-      this.roundPanel2.Controls.Add(this.labelStable);
-      this.roundPanel2.Controls.Add(this.labelZero);
-      this.roundPanel2.Controls.Add(this.lblChengZhong);
-      this.roundPanel2.Location = new System.Drawing.Point(6, 3);
-      this.roundPanel2.Margin = new System.Windows.Forms.Padding(0);
-      this.roundPanel2.Name = "roundPanel2";
-      this.roundPanel2.Size = new System.Drawing.Size(162, 74);
-      this.roundPanel2.TabIndex = 36;
-      // 
-      // labelStable
-      // 
-      this.labelStable.AutoSize = true;
-      this.labelStable.BackColor = System.Drawing.Color.White;
-      this.labelStable.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.labelStable.Font = new System.Drawing.Font("微软雅黑", 9F);
-      this.labelStable.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-      this.labelStable.Location = new System.Drawing.Point(119, 1);
-      this.labelStable.Name = "labelStable";
-      this.labelStable.Size = new System.Drawing.Size(17, 19);
-      this.labelStable.TabIndex = 13;
-      this.labelStable.Text = "S";
-      this.labelStable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-      // 
-      // labelZero
-      // 
-      this.labelZero.AutoSize = true;
-      this.labelZero.BackColor = System.Drawing.Color.White;
-      this.labelZero.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.labelZero.Font = new System.Drawing.Font("微软雅黑", 9F);
-      this.labelZero.Location = new System.Drawing.Point(138, 1);
-      this.labelZero.Name = "labelZero";
-      this.labelZero.Size = new System.Drawing.Size(17, 19);
-      this.labelZero.TabIndex = 12;
-      this.labelZero.Text = "0";
-      this.labelZero.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-      // 
-      // lblChengZhong
-      // 
-      this.lblChengZhong.AutoSize = true;
-      this.lblChengZhong.Font = new System.Drawing.Font("宋体", 25F);
-      this.lblChengZhong.ForeColor = System.Drawing.Color.Red;
-      this.lblChengZhong.Location = new System.Drawing.Point(5, 19);
-      this.lblChengZhong.Margin = new System.Windows.Forms.Padding(0);
-      this.lblChengZhong.Name = "lblChengZhong";
-      this.lblChengZhong.Size = new System.Drawing.Size(83, 34);
-      this.lblChengZhong.TabIndex = 0;
-      this.lblChengZhong.Text = "0.00";
-      // 
       // logBtn
       // 
       this.logBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.logBtn.BackColor = System.Drawing.Color.CadetBlue;
       this.logBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.logBtn.ForeColor = System.Drawing.Color.White;
-      this.logBtn.Location = new System.Drawing.Point(680, 4);
+      this.logBtn.Location = new System.Drawing.Point(908, 5);
+      this.logBtn.Margin = new System.Windows.Forms.Padding(4);
       this.logBtn.Name = "logBtn";
       this.logBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.logBtn.Size = new System.Drawing.Size(101, 41);
+      this.logBtn.Size = new System.Drawing.Size(135, 51);
       this.logBtn.TabIndex = 25;
       this.logBtn.Text = "日志";
       this.logBtn.UseVisualStyleBackColor = false;
@@ -584,25 +515,37 @@
       this.closeBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
       this.closeBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.closeBtn.ForeColor = System.Drawing.Color.White;
-      this.closeBtn.Location = new System.Drawing.Point(1109, 7);
+      this.closeBtn.Location = new System.Drawing.Point(1480, 9);
+      this.closeBtn.Margin = new System.Windows.Forms.Padding(4);
       this.closeBtn.Name = "closeBtn";
       this.closeBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.closeBtn.Size = new System.Drawing.Size(111, 41);
+      this.closeBtn.Size = new System.Drawing.Size(148, 51);
       this.closeBtn.TabIndex = 18;
       this.closeBtn.Text = "关闭";
       this.closeBtn.UseVisualStyleBackColor = false;
       this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click);
       // 
+      // uWeightControl1
+      // 
+      this.uWeightControl1.BackColor = System.Drawing.Color.Transparent;
+      this.uWeightControl1.Location = new System.Drawing.Point(16, 9);
+      this.uWeightControl1.Margin = new System.Windows.Forms.Padding(5);
+      this.uWeightControl1.Name = "uWeightControl1";
+      this.uWeightControl1.Size = new System.Drawing.Size(349, 92);
+      this.uWeightControl1.TabIndex = 17;
+      this.uWeightControl1.WeightFalg = null;
+      // 
       // goodsSetBtn
       // 
       this.goodsSetBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.goodsSetBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
       this.goodsSetBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.goodsSetBtn.ForeColor = System.Drawing.Color.White;
-      this.goodsSetBtn.Location = new System.Drawing.Point(645, 3);
+      this.goodsSetBtn.Location = new System.Drawing.Point(888, 4);
+      this.goodsSetBtn.Margin = new System.Windows.Forms.Padding(4);
       this.goodsSetBtn.Name = "goodsSetBtn";
       this.goodsSetBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.goodsSetBtn.Size = new System.Drawing.Size(111, 62);
+      this.goodsSetBtn.Size = new System.Drawing.Size(148, 78);
       this.goodsSetBtn.TabIndex = 19;
       this.goodsSetBtn.Text = "产品设置";
       this.goodsSetBtn.UseVisualStyleBackColor = false;
@@ -613,10 +556,11 @@
       this.colorButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
       this.colorButton2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       this.colorButton2.ForeColor = System.Drawing.Color.White;
-      this.colorButton2.Location = new System.Drawing.Point(344, 178);
+      this.colorButton2.Location = new System.Drawing.Point(459, 222);
+      this.colorButton2.Margin = new System.Windows.Forms.Padding(4);
       this.colorButton2.Name = "colorButton2";
       this.colorButton2.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
-      this.colorButton2.Size = new System.Drawing.Size(91, 38);
+      this.colorButton2.Size = new System.Drawing.Size(121, 48);
       this.colorButton2.TabIndex = 5;
       this.colorButton2.Text = "打总码";
       this.colorButton2.UseVisualStyleBackColor = false;
@@ -628,10 +572,11 @@
       this.viewTaskBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
       this.viewTaskBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.viewTaskBtn.ForeColor = System.Drawing.Color.White;
-      this.viewTaskBtn.Location = new System.Drawing.Point(13, 124);
+      this.viewTaskBtn.Location = new System.Drawing.Point(-9, 155);
+      this.viewTaskBtn.Margin = new System.Windows.Forms.Padding(4);
       this.viewTaskBtn.Name = "viewTaskBtn";
       this.viewTaskBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.viewTaskBtn.Size = new System.Drawing.Size(100, 41);
+      this.viewTaskBtn.Size = new System.Drawing.Size(133, 51);
       this.viewTaskBtn.TabIndex = 24;
       this.viewTaskBtn.Text = "完工";
       this.viewTaskBtn.UseVisualStyleBackColor = false;
@@ -642,10 +587,11 @@
       this.colorButton1.BackColor = System.Drawing.Color.Blue;
       this.colorButton1.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       this.colorButton1.ForeColor = System.Drawing.Color.White;
-      this.colorButton1.Location = new System.Drawing.Point(13, 178);
+      this.colorButton1.Location = new System.Drawing.Point(17, 222);
+      this.colorButton1.Margin = new System.Windows.Forms.Padding(4);
       this.colorButton1.Name = "colorButton1";
       this.colorButton1.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
-      this.colorButton1.Size = new System.Drawing.Size(100, 38);
+      this.colorButton1.Size = new System.Drawing.Size(133, 48);
       this.colorButton1.TabIndex = 3;
       this.colorButton1.Text = "+";
       this.colorButton1.UseVisualStyleBackColor = false;
@@ -657,10 +603,11 @@
       this.deleteBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
       this.deleteBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.deleteBtn.ForeColor = System.Drawing.Color.White;
-      this.deleteBtn.Location = new System.Drawing.Point(178, 124);
+      this.deleteBtn.Location = new System.Drawing.Point(211, 155);
+      this.deleteBtn.Margin = new System.Windows.Forms.Padding(4);
       this.deleteBtn.Name = "deleteBtn";
       this.deleteBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.deleteBtn.Size = new System.Drawing.Size(85, 41);
+      this.deleteBtn.Size = new System.Drawing.Size(113, 51);
       this.deleteBtn.TabIndex = 23;
       this.deleteBtn.Text = "删除";
       this.deleteBtn.UseVisualStyleBackColor = false;
@@ -672,10 +619,11 @@
       this.rePrintBtn.Enabled = false;
       this.rePrintBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.rePrintBtn.ForeColor = System.Drawing.Color.White;
-      this.rePrintBtn.Location = new System.Drawing.Point(344, 126);
+      this.rePrintBtn.Location = new System.Drawing.Point(459, 158);
+      this.rePrintBtn.Margin = new System.Windows.Forms.Padding(4);
       this.rePrintBtn.Name = "rePrintBtn";
       this.rePrintBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.rePrintBtn.Size = new System.Drawing.Size(91, 39);
+      this.rePrintBtn.Size = new System.Drawing.Size(121, 49);
       this.rePrintBtn.TabIndex = 22;
       this.rePrintBtn.Text = "补打";
       this.rePrintBtn.UseVisualStyleBackColor = false;
@@ -684,15 +632,15 @@
       // 
       // SegmentProductionAutoForm
       // 
-      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.White;
-      this.ClientSize = new System.Drawing.Size(1226, 704);
+      this.ClientSize = new System.Drawing.Size(1635, 880);
       this.Controls.Add(this.splitContainer1);
+      this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.Name = "SegmentProductionAutoForm";
       this.Text = "分割品车间称重计数";
       this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-      this.Load += new System.EventHandler(this.SegmentProductionAutoForm_Load);
       this.groupBox2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).EndInit();
       this.splitContainer1.Panel1.ResumeLayout(false);
@@ -707,37 +655,36 @@
       this.splitContainer2.ResumeLayout(false);
       this.groupBox1.ResumeLayout(false);
       this.groupBox1.PerformLayout();
-      this.roundPanel2.ResumeLayout(false);
-      this.roundPanel2.PerformLayout();
       this.ResumeLayout(false);
 
-    }
-
-    #endregion
-
-    private WinFormControl.ULabel uLabel3;
-    private System.Windows.Forms.GroupBox groupBox2;
-    private WinFormControl.UDataGridView taskDataGrid;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Item;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Need;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Done;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Last;
-    private WinFormControl.ULabel GoodsLabel;
-    private System.Windows.Forms.SplitContainer splitContainer1;
-    private WinFormControl.UTimerLabel uTimerLabel1;
-    private System.Windows.Forms.ComboBox productBatchSelect;
-    private System.Windows.Forms.ComboBox workUnitSelect;
-    private WinFormControl.ULabel uLabel1;
-    private WinFormControl.ULabel uLabel2;
-    private WinFormControl.NetStateWatch netStateWatch1;
+    }
+
+    #endregion
+
+    private WinFormControl.ULabel uLabel3;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private WinFormControl.UDataGridView taskDataGrid;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Item;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Need;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Done;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Last;
+    private WinFormControl.ULabel GoodsLabel;
+    private System.Windows.Forms.SplitContainer splitContainer1;
+    private WinFormControl.UTimerLabel uTimerLabel1;
+    private System.Windows.Forms.ComboBox productBatchSelect;
+    private System.Windows.Forms.ComboBox workUnitSelect;
+    private WinFormControl.ULabel uLabel1;
+    private WinFormControl.ULabel uLabel2;
+    private WinFormControl.NetStateWatch netStateWatch1;
     private System.Windows.Forms.SplitContainer splitContainer2;
-    private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
-    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    private Controls.ColorButton rePrintBtn;
-    private Controls.ColorButton closeBtn;
-    private Controls.ColorButton goodsSetBtn;
-    private Controls.ColorButton deleteBtn;
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
+    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+    private Controls.WeightControl uWeightControl1;
+    private Controls.ColorButton rePrintBtn;
+    private Controls.ColorButton closeBtn;
+    private Controls.ColorButton goodsSetBtn;
+    private Controls.ColorButton deleteBtn;
     private System.Windows.Forms.Label msglbl;
     private System.Windows.Forms.CheckBox barPrintCheck;
     private Controls.ColorButton logBtn;
@@ -752,13 +699,5 @@
     private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4;
     private System.Windows.Forms.Label label3;
     private WinFormControl.ULabel butcherDateBox;
-    private Controls.ColorButton weightSwitch;
-    private Controls.ColorButton zeroBtn;
-    private Controls.RoundPanel roundPanel2;
-    private System.Windows.Forms.Label lblChengZhong;
-    private System.Windows.Forms.Timer timer1;
-    private System.IO.Ports.SerialPort serialPort1;
-    private System.Windows.Forms.Label labelStable;
-    private System.Windows.Forms.Label labelZero;
-  }
+  }
 }

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.resx

@@ -120,10 +120,4 @@
   <metadata name="T_Last.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>216, 16</value>
-  </metadata>
-  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>306, 16</value>
-  </metadata>
 </root>