需求单No.5325

ButcherFactory.Form/Controls/WeightSettingFrom.cs

@@ -14,7 +14,7 @@ namespace ButcherFactory.Controls
   {
     List<string> weight = new List<string> { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000", "JST2018S", "一体称" , "JST8180" };
     List<string> com = new List<string> { "COM1", "COM2", "COM3", "COM4", "COM5" };
-    List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" };
+    List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" , "115200" };
     List<string> bit = new List<string> { "5", "6", "7", "8" };
     List<string> weightRead = new List<string> { "稳定读取", "连续发送" };
     string _flag;

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs

@@ -92,19 +92,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(72, 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);
       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;
       // 
@@ -130,7 +132,8 @@
             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);
       this.taskDataGrid.MultiSelect = false;
       this.taskDataGrid.Name = "taskDataGrid";
       this.taskDataGrid.ReadOnly = true;
@@ -141,7 +144,7 @@
       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
@@ -192,9 +195,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(190, 223);
+      this.GoodsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.GoodsLabel.Name = "GoodsLabel";
-      this.GoodsLabel.Size = new System.Drawing.Size(72, 16);
+      this.GoodsLabel.Size = new System.Drawing.Size(89, 20);
       this.GoodsLabel.TabIndex = 1;
       this.GoodsLabel.Text = "存货名称";
       // 
@@ -205,6 +209,7 @@
       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);
       this.splitContainer1.Name = "splitContainer1";
       this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
@@ -233,8 +238,9 @@
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-      this.splitContainer1.Size = new System.Drawing.Size(1155, 676);
-      this.splitContainer1.SplitterDistance = 100;
+      this.splitContainer1.Size = new System.Drawing.Size(1440, 810);
+      this.splitContainer1.SplitterDistance = 150;
+      this.splitContainer1.SplitterWidth = 5;
       this.splitContainer1.TabIndex = 1;
       // 
       // scDate
@@ -242,9 +248,10 @@
       this.scDate.BackColor = System.Drawing.Color.Transparent;
       this.scDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
       this.scDate.Font = new System.Drawing.Font("宋体", 15F);
-      this.scDate.Location = new System.Drawing.Point(677, 7);
+      this.scDate.Location = new System.Drawing.Point(972, 8);
+      this.scDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.scDate.Name = "scDate";
-      this.scDate.Size = new System.Drawing.Size(115, 30);
+      this.scDate.Size = new System.Drawing.Size(153, 37);
       this.scDate.TabIndex = 37;
       this.scDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
       this.scDate.MouseClick += new System.Windows.Forms.MouseEventHandler(this.scDateBox_MouseClick);
@@ -253,9 +260,10 @@
       // 
       this.label4.AutoSize = true;
       this.label4.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label4.Location = new System.Drawing.Point(603, 15);
+      this.label4.Location = new System.Drawing.Point(873, 18);
+      this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label4.Name = "label4";
-      this.label4.Size = new System.Drawing.Size(98, 18);
+      this.label4.Size = new System.Drawing.Size(120, 22);
       this.label4.TabIndex = 36;
       this.label4.Text = "生产日期：";
       // 
@@ -264,9 +272,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(485, 8);
+      this.butcherDateBox.Location = new System.Drawing.Point(647, 10);
+      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);
@@ -275,18 +284,20 @@
       // 
       this.label3.AutoSize = true;
       this.label3.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label3.Location = new System.Drawing.Point(397, 14);
+      this.label3.Location = new System.Drawing.Point(529, 18);
+      this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label3.Name = "label3";
-      this.label3.Size = new System.Drawing.Size(98, 18);
+      this.label3.Size = new System.Drawing.Size(120, 22);
       this.label3.TabIndex = 30;
       this.label3.Text = "屠宰日期：";
       // 
       // numberInput
       // 
       this.numberInput.Font = new System.Drawing.Font("宋体", 15F);
-      this.numberInput.Location = new System.Drawing.Point(677, 48);
+      this.numberInput.Location = new System.Drawing.Point(972, 60);
+      this.numberInput.Margin = new System.Windows.Forms.Padding(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);
@@ -295,18 +306,20 @@
       // 
       this.label2.AutoSize = true;
       this.label2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label2.Location = new System.Drawing.Point(603, 53);
+      this.label2.Location = new System.Drawing.Point(873, 66);
+      this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label2.Name = "label2";
-      this.label2.Size = new System.Drawing.Size(62, 18);
+      this.label2.Size = new System.Drawing.Size(76, 22);
       this.label2.TabIndex = 28;
       this.label2.Text = "数量：";
       // 
       // statisticNumberBox
       // 
       this.statisticNumberBox.Font = new System.Drawing.Font("宋体", 15F);
-      this.statisticNumberBox.Location = new System.Drawing.Point(485, 49);
+      this.statisticNumberBox.Location = new System.Drawing.Point(647, 61);
+      this.statisticNumberBox.Margin = new System.Windows.Forms.Padding(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);
       // 
@@ -314,9 +327,10 @@
       // 
       this.label1.AutoSize = true;
       this.label1.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label1.Location = new System.Drawing.Point(397, 52);
+      this.label1.Location = new System.Drawing.Point(529, 65);
+      this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(98, 18);
+      this.label1.Size = new System.Drawing.Size(120, 22);
       this.label1.TabIndex = 26;
       this.label1.Text = "统计数量：";
       // 
@@ -324,86 +338,88 @@
       // 
       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(23, 119);
+      this.msglbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.msglbl.Name = "msglbl";
-      this.msglbl.Size = new System.Drawing.Size(0, 12);
+      this.msglbl.Size = new System.Drawing.Size(0, 15);
       this.msglbl.TabIndex = 24;
       // 
       // barPrintCheck
       // 
       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);
       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;
       // 
       // uTimerLabel1
       // 
-      this.uTimerLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.uTimerLabel1.AutoSize = true;
       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(1012, 53);
+      this.uTimerLabel1.Location = new System.Drawing.Point(1224, 62);
+      this.uTimerLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uTimerLabel1.Name = "uTimerLabel1";
-      this.uTimerLabel1.Size = new System.Drawing.Size(136, 16);
+      this.uTimerLabel1.Size = new System.Drawing.Size(169, 20);
       this.uTimerLabel1.TabIndex = 14;
       this.uTimerLabel1.Text = "4月21日 16:32:19";
       // 
       // productBatchSelect
       // 
-      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(836, 48);
+      this.productBatchSelect.Location = new System.Drawing.Point(984, 109);
+      this.productBatchSelect.Margin = new System.Windows.Forms.Padding(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
       // 
-      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(836, 7);
+      this.workUnitSelect.Location = new System.Drawing.Point(640, 107);
+      this.workUnitSelect.Margin = new System.Windows.Forms.Padding(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
       // 
-      this.uLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.uLabel1.AutoSize = true;
       this.uLabel1.BackColor = System.Drawing.Color.Transparent;
       this.uLabel1.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.uLabel1.Location = new System.Drawing.Point(753, 13);
+      this.uLabel1.Location = new System.Drawing.Point(529, 114);
+      this.uLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uLabel1.Name = "uLabel1";
-      this.uLabel1.Size = new System.Drawing.Size(98, 18);
+      this.uLabel1.Size = new System.Drawing.Size(120, 22);
       this.uLabel1.TabIndex = 12;
       this.uLabel1.Text = "工作单元：";
       // 
       // uLabel2
       // 
-      this.uLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.uLabel2.AutoSize = true;
       this.uLabel2.BackColor = System.Drawing.Color.Transparent;
       this.uLabel2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.uLabel2.Location = new System.Drawing.Point(753, 51);
+      this.uLabel2.Location = new System.Drawing.Point(873, 113);
+      this.uLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
       this.uLabel2.Name = "uLabel2";
-      this.uLabel2.Size = new System.Drawing.Size(98, 18);
+      this.uLabel2.Size = new System.Drawing.Size(120, 22);
       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.Margin = new System.Windows.Forms.Padding(4);
+      this.netStateWatch1.Location = new System.Drawing.Point(389, 2);
+      this.netStateWatch1.Margin = new System.Windows.Forms.Padding(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
@@ -412,6 +428,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);
       this.splitContainer2.Name = "splitContainer2";
       // 
       // splitContainer2.Panel1
@@ -430,8 +447,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(1155, 572);
-      this.splitContainer2.SplitterDistance = 697;
+      this.splitContainer2.Size = new System.Drawing.Size(1440, 655);
+      this.splitContainer2.SplitterDistance = 823;
+      this.splitContainer2.SplitterWidth = 5;
       this.splitContainer2.TabIndex = 0;
       // 
       // flowLayoutPanel2
@@ -441,9 +459,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, 89);
+      this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
       this.flowLayoutPanel2.Name = "flowLayoutPanel2";
-      this.flowLayoutPanel2.Size = new System.Drawing.Size(708, 495);
+      this.flowLayoutPanel2.Size = new System.Drawing.Size(818, 564);
       this.flowLayoutPanel2.TabIndex = 24;
       // 
       // flowLayoutPanel1
@@ -451,9 +470,10 @@
       this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1);
+      this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 4);
+      this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
       this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-      this.flowLayoutPanel1.Size = new System.Drawing.Size(591, 70);
+      this.flowLayoutPanel1.Size = new System.Drawing.Size(681, 87);
       this.flowLayoutPanel1.TabIndex = 22;
       // 
       // groupBox1
@@ -463,10 +483,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(4, 279);
+      this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
-      this.groupBox1.Size = new System.Drawing.Size(447, 339);
+      this.groupBox1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
+      this.groupBox1.Size = new System.Drawing.Size(603, 364);
       this.groupBox1.TabIndex = 5;
       this.groupBox1.TabStop = false;
       // 
@@ -476,9 +497,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);
       this.flowLayoutPanel4.Name = "flowLayoutPanel4";
-      this.flowLayoutPanel4.Size = new System.Drawing.Size(437, 245);
+      this.flowLayoutPanel4.Size = new System.Drawing.Size(590, 246);
       this.flowLayoutPanel4.TabIndex = 5;
       // 
       // flowLayoutPanel3
@@ -486,23 +508,23 @@
       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(589, 84);
       this.flowLayoutPanel3.TabIndex = 4;
       this.flowLayoutPanel3.WrapContents = false;
       // 
       // 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("宋体", 14F);
       this.logBtn.ForeColor = System.Drawing.Color.White;
-      this.logBtn.Location = new System.Drawing.Point(669, 4);
+      this.logBtn.Location = new System.Drawing.Point(1133, 2);
+      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(80, 41);
+      this.logBtn.Size = new System.Drawing.Size(107, 51);
       this.logBtn.TabIndex = 25;
       this.logBtn.Text = "日志";
       this.logBtn.UseVisualStyleBackColor = false;
@@ -510,14 +532,14 @@
       // 
       // closeBtn
       // 
-      this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       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(1038, 7);
+      this.closeBtn.Location = new System.Drawing.Point(1245, 1);
+      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;
@@ -526,10 +548,10 @@
       // uWeightControl1
       // 
       this.uWeightControl1.BackColor = System.Drawing.Color.Transparent;
-      this.uWeightControl1.Location = new System.Drawing.Point(12, 7);
-      this.uWeightControl1.Margin = new System.Windows.Forms.Padding(4);
+      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(262, 74);
+      this.uWeightControl1.Size = new System.Drawing.Size(349, 92);
       this.uWeightControl1.TabIndex = 17;
       this.uWeightControl1.WeightFalg = null;
       // 
@@ -539,10 +561,11 @@
       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(596, 3);
+      this.goodsSetBtn.Location = new System.Drawing.Point(683, 14);
+      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(134, 77);
       this.goodsSetBtn.TabIndex = 19;
       this.goodsSetBtn.Text = "产品设置";
       this.goodsSetBtn.UseVisualStyleBackColor = false;
@@ -553,10 +576,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(457, 223);
+      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;
@@ -568,10 +592,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(-10, 124);
+      this.viewTaskBtn.Location = new System.Drawing.Point(-9, 156);
+      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;
@@ -582,10 +607,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(4, 223);
+      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;
@@ -597,10 +623,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(155, 124);
+      this.deleteBtn.Location = new System.Drawing.Point(211, 156);
+      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;
@@ -612,10 +639,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(457, 159);
+      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;
@@ -624,11 +652,12 @@
       // 
       // 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(1155, 676);
+      this.ClientSize = new System.Drawing.Size(1440, 810);
       this.Controls.Add(this.splitContainer1);
+      this.Margin = new System.Windows.Forms.Padding(4);
       this.Name = "SegmentProductionAutoForm";
       this.Text = "分割品车间称重计数";
       this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs

@@ -57,6 +57,7 @@ namespace ButcherFactory.SegmentProductionAuto_
       scDate.Text = scDateValue.ToString("yyyy-MM-dd");
       netStateWatch1.GetConnectState = () => LoginUtil.TestConnection(500);
       this.FormClosing += SegmentProductionAutoForm_FormClosing;
+      this.Load += Form1_Load;
       workUnitSelect.SelectedIndexChanged += delegate
       {
         if (workUnitSelect.SelectedValue == null)
@@ -89,6 +90,17 @@ namespace ButcherFactory.SegmentProductionAuto_
       };
     }
 
+    private void Form1_Load(object sender, EventArgs e)
+    {
+      Rectangle workArea = Screen.PrimaryScreen.WorkingArea;
+      // 取屏幕可用区域的82%，上限限制 1440, 810
+      int initW = Math.Min((int)(workArea.Width * 0.9), 1440);
+      int initH = Math.Min((int)(workArea.Height * 0.9), 810);
+      this.ClientSize = new Size(initW, initH);
+      this.MinimumSize = new Size(1000, 650);
+    }
+
+
     /// <summary>
     /// 线程安全的UI更新，窗体已关闭/释放直接跳过，不抛异常
     /// </summary>