diff --git a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.Designer.cs b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.Designer.cs
index 665f21f..c73353a 100644
--- a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.Designer.cs
+++ b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.Designer.cs
@@ -32,21 +32,22 @@ namespace HighWayIot.Winform.UserControlPages
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.Label label6;
             this.panel1 = new System.Windows.Forms.Panel();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
@@ -61,6 +62,8 @@ namespace HighWayIot.Winform.UserControlPages
             this.DayTimeLabel = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.ReweightLabel = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
             this.RgvNoLabel = new System.Windows.Forms.Label();
             this.SpecCodeLabel = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
@@ -91,8 +94,8 @@ namespace HighWayIot.Winform.UserControlPages
             this.panel6 = new System.Windows.Forms.Panel();
             this.MoveText = new Mesnac.Controls.ChemicalWeighing.HslMoveText();
             this.panel3 = new System.Windows.Forms.Panel();
-            this.ReweightLabel = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
+            this.DeviceNoLabel = new System.Windows.Forms.Label();
+            label6 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
@@ -265,6 +268,8 @@ namespace HighWayIot.Winform.UserControlPages
             // panel2
             // 
             this.panel2.BackColor = System.Drawing.Color.Gray;
+            this.panel2.Controls.Add(this.DeviceNoLabel);
+            this.panel2.Controls.Add(label6);
             this.panel2.Controls.Add(this.ReweightLabel);
             this.panel2.Controls.Add(this.label5);
             this.panel2.Controls.Add(this.RgvNoLabel);
@@ -284,6 +289,28 @@ namespace HighWayIot.Winform.UserControlPages
             this.panel2.Size = new System.Drawing.Size(1143, 114);
             this.panel2.TabIndex = 2;
             // 
+            // ReweightLabel
+            // 
+            this.ReweightLabel.AutoSize = true;
+            this.ReweightLabel.Font = new System.Drawing.Font("微软雅黑", 18F);
+            this.ReweightLabel.ForeColor = System.Drawing.Color.Khaki;
+            this.ReweightLabel.Location = new System.Drawing.Point(935, 59);
+            this.ReweightLabel.Name = "ReweightLabel";
+            this.ReweightLabel.Size = new System.Drawing.Size(61, 31);
+            this.ReweightLabel.TabIndex = 13;
+            this.ReweightLabel.Text = "N/A";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 18F);
+            this.label5.ForeColor = System.Drawing.Color.Khaki;
+            this.label5.Location = new System.Drawing.Point(789, 59);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(165, 31);
+            this.label5.TabIndex = 12;
+            this.label5.Text = "复重重量(g)：";
+            // 
             // RgvNoLabel
             // 
             this.RgvNoLabel.AutoSize = true;
@@ -322,7 +349,7 @@ namespace HighWayIot.Winform.UserControlPages
             this.RecipeNameLabel.AutoSize = true;
             this.RecipeNameLabel.Font = new System.Drawing.Font("微软雅黑", 18F);
             this.RecipeNameLabel.ForeColor = System.Drawing.Color.LightGoldenrodYellow;
-            this.RecipeNameLabel.Location = new System.Drawing.Point(302, 23);
+            this.RecipeNameLabel.Location = new System.Drawing.Point(478, 23);
             this.RecipeNameLabel.Name = "RecipeNameLabel";
             this.RecipeNameLabel.Size = new System.Drawing.Size(494, 31);
             this.RecipeNameLabel.TabIndex = 5;
@@ -377,7 +404,7 @@ namespace HighWayIot.Winform.UserControlPages
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 18F);
             this.label3.ForeColor = System.Drawing.Color.LightGoldenrodYellow;
-            this.label3.Location = new System.Drawing.Point(182, 23);
+            this.label3.Location = new System.Drawing.Point(358, 23);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(134, 31);
             this.label3.TabIndex = 2;
@@ -404,13 +431,13 @@ namespace HighWayIot.Winform.UserControlPages
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MonitorDataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            this.MonitorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            this.MonitorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.MonitorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.MonitorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.No,
@@ -442,10 +469,10 @@ namespace HighWayIot.Winform.UserControlPages
             // No
             // 
             this.No.DataPropertyName = "No";
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.No.DefaultCellStyle = dataGridViewCellStyle17;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.No.DefaultCellStyle = dataGridViewCellStyle2;
             this.No.HeaderText = "序号";
             this.No.Name = "No";
             this.No.ReadOnly = true;
@@ -454,9 +481,9 @@ namespace HighWayIot.Winform.UserControlPages
             // VulcanizationNo
             // 
             this.VulcanizationNo.DataPropertyName = "VulcanizationNo";
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.VulcanizationNo.DefaultCellStyle = dataGridViewCellStyle18;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.VulcanizationNo.DefaultCellStyle = dataGridViewCellStyle3;
             this.VulcanizationNo.HeaderText = "机位";
             this.VulcanizationNo.Name = "VulcanizationNo";
             this.VulcanizationNo.ReadOnly = true;
@@ -465,9 +492,9 @@ namespace HighWayIot.Winform.UserControlPages
             // StartTime
             // 
             this.StartTime.DataPropertyName = "StartTime";
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.StartTime.DefaultCellStyle = dataGridViewCellStyle19;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.StartTime.DefaultCellStyle = dataGridViewCellStyle4;
             this.StartTime.HeaderText = "开始时间";
             this.StartTime.Name = "StartTime";
             this.StartTime.ReadOnly = true;
@@ -476,9 +503,9 @@ namespace HighWayIot.Winform.UserControlPages
             // RecipeCode
             // 
             this.RecipeCode.DataPropertyName = "RecipeCode";
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.RecipeCode.DefaultCellStyle = dataGridViewCellStyle20;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.RecipeCode.DefaultCellStyle = dataGridViewCellStyle5;
             this.RecipeCode.HeaderText = "成品代号";
             this.RecipeCode.Name = "RecipeCode";
             this.RecipeCode.ReadOnly = true;
@@ -488,9 +515,9 @@ namespace HighWayIot.Winform.UserControlPages
             // 
             this.RecipeName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.RecipeName.DataPropertyName = "RecipeName";
-            dataGridViewCellStyle21.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.RecipeName.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.RecipeName.DefaultCellStyle = dataGridViewCellStyle6;
             this.RecipeName.HeaderText = "标称尺度";
             this.RecipeName.Name = "RecipeName";
             this.RecipeName.ReadOnly = true;
@@ -498,9 +525,9 @@ namespace HighWayIot.Winform.UserControlPages
             // SpecCode
             // 
             this.SpecCode.DataPropertyName = "SpecCode";
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.SpecCode.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.SpecCode.DefaultCellStyle = dataGridViewCellStyle7;
             this.SpecCode.HeaderText = "SPEC编号";
             this.SpecCode.Name = "SpecCode";
             this.SpecCode.ReadOnly = true;
@@ -509,10 +536,10 @@ namespace HighWayIot.Winform.UserControlPages
             // DeviceNo
             // 
             this.DeviceNo.DataPropertyName = "DeviceNo";
-            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DeviceNo.DefaultCellStyle = dataGridViewCellStyle23;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.DeviceNo.DefaultCellStyle = dataGridViewCellStyle8;
             this.DeviceNo.HeaderText = "小车号";
             this.DeviceNo.Name = "DeviceNo";
             this.DeviceNo.ReadOnly = true;
@@ -521,9 +548,9 @@ namespace HighWayIot.Winform.UserControlPages
             // StandardWeight
             // 
             this.StandardWeight.DataPropertyName = "StandardWeight";
-            dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.StandardWeight.DefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.StandardWeight.DefaultCellStyle = dataGridViewCellStyle9;
             this.StandardWeight.HeaderText = "标准重量";
             this.StandardWeight.Name = "StandardWeight";
             this.StandardWeight.ReadOnly = true;
@@ -531,9 +558,9 @@ namespace HighWayIot.Winform.UserControlPages
             // BaseRubFinishTime
             // 
             this.BaseRubFinishTime.DataPropertyName = "BaseRubTimeSpan";
-            dataGridViewCellStyle25.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.BaseRubFinishTime.DefaultCellStyle = dataGridViewCellStyle25;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.BaseRubFinishTime.DefaultCellStyle = dataGridViewCellStyle10;
             this.BaseRubFinishTime.HeaderText = "基部胶完成时间";
             this.BaseRubFinishTime.Name = "BaseRubFinishTime";
             this.BaseRubFinishTime.ReadOnly = true;
@@ -542,9 +569,9 @@ namespace HighWayIot.Winform.UserControlPages
             // MidRubFinishTime
             // 
             this.MidRubFinishTime.DataPropertyName = "MidRubTimeSpan";
-            dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.MidRubFinishTime.DefaultCellStyle = dataGridViewCellStyle26;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.MidRubFinishTime.DefaultCellStyle = dataGridViewCellStyle11;
             this.MidRubFinishTime.HeaderText = "中层胶完成时间";
             this.MidRubFinishTime.Name = "MidRubFinishTime";
             this.MidRubFinishTime.ReadOnly = true;
@@ -553,9 +580,9 @@ namespace HighWayIot.Winform.UserControlPages
             // RowTireFinishTime
             // 
             this.RowTireFinishTime.DataPropertyName = "FaceRubTimeSpan";
-            dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.RowTireFinishTime.DefaultCellStyle = dataGridViewCellStyle27;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.RowTireFinishTime.DefaultCellStyle = dataGridViewCellStyle12;
             this.RowTireFinishTime.HeaderText = "生胎完成时间";
             this.RowTireFinishTime.Name = "RowTireFinishTime";
             this.RowTireFinishTime.ReadOnly = true;
@@ -564,9 +591,9 @@ namespace HighWayIot.Winform.UserControlPages
             // TireWeight
             // 
             this.TireWeight.DataPropertyName = "RawTireWeight";
-            dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.TireWeight.DefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.TireWeight.DefaultCellStyle = dataGridViewCellStyle13;
             this.TireWeight.HeaderText = "生胎重量";
             this.TireWeight.Name = "TireWeight";
             this.TireWeight.ReadOnly = true;
@@ -574,9 +601,9 @@ namespace HighWayIot.Winform.UserControlPages
             // RepeatWeight
             // 
             this.RepeatWeight.DataPropertyName = "RepeatWeight";
-            dataGridViewCellStyle29.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.RepeatWeight.DefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.RepeatWeight.DefaultCellStyle = dataGridViewCellStyle14;
             this.RepeatWeight.HeaderText = "复重重量";
             this.RepeatWeight.Name = "RepeatWeight";
             this.RepeatWeight.ReadOnly = true;
@@ -584,9 +611,9 @@ namespace HighWayIot.Winform.UserControlPages
             // IsDone
             // 
             this.IsDone.DataPropertyName = "IsDone";
-            dataGridViewCellStyle30.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.IsDone.DefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.IsDone.DefaultCellStyle = dataGridViewCellStyle15;
             this.IsDone.HeaderText = "状态";
             this.IsDone.Name = "IsDone";
             this.IsDone.ReadOnly = true;
@@ -644,27 +671,27 @@ namespace HighWayIot.Winform.UserControlPages
             this.panel3.Size = new System.Drawing.Size(1905, 228);
             this.panel3.TabIndex = 3;
             // 
-            // ReweightLabel
+            // DeviceNoLabel
             // 
-            this.ReweightLabel.AutoSize = true;
-            this.ReweightLabel.Font = new System.Drawing.Font("微软雅黑", 18F);
-            this.ReweightLabel.ForeColor = System.Drawing.Color.Khaki;
-            this.ReweightLabel.Location = new System.Drawing.Point(935, 59);
-            this.ReweightLabel.Name = "ReweightLabel";
-            this.ReweightLabel.Size = new System.Drawing.Size(61, 31);
-            this.ReweightLabel.TabIndex = 13;
-            this.ReweightLabel.Text = "N/A";
+            this.DeviceNoLabel.AutoSize = true;
+            this.DeviceNoLabel.Font = new System.Drawing.Font("微软雅黑", 18F);
+            this.DeviceNoLabel.ForeColor = System.Drawing.Color.Khaki;
+            this.DeviceNoLabel.Location = new System.Drawing.Point(265, 23);
+            this.DeviceNoLabel.Name = "DeviceNoLabel";
+            this.DeviceNoLabel.Size = new System.Drawing.Size(61, 31);
+            this.DeviceNoLabel.TabIndex = 15;
+            this.DeviceNoLabel.Text = "N/A";
             // 
-            // label5
+            // label6
             // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 18F);
-            this.label5.ForeColor = System.Drawing.Color.Khaki;
-            this.label5.Location = new System.Drawing.Point(789, 59);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(165, 31);
-            this.label5.TabIndex = 12;
-            this.label5.Text = "复重重量(g)：";
+            label6.AutoSize = true;
+            label6.Font = new System.Drawing.Font("微软雅黑", 18F);
+            label6.ForeColor = System.Drawing.Color.Khaki;
+            label6.Location = new System.Drawing.Point(171, 23);
+            label6.Name = "label6";
+            label6.Size = new System.Drawing.Size(110, 31);
+            label6.TabIndex = 14;
+            label6.Text = "机台号：";
             // 
             // MonitorMainPage
             // 
@@ -743,5 +770,6 @@ namespace HighWayIot.Winform.UserControlPages
         private DataGridViewTextBoxColumn IsDone;
         private Label ReweightLabel;
         private Label label5;
+        private Label DeviceNoLabel;
     }
 }
diff --git a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.cs b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.cs
index 4d0cab0..d75d3e6 100644
--- a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.cs
+++ b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.cs
@@ -235,11 +235,11 @@ namespace HighWayIot.Winform.UserControlPages
                     MonitorDataGridView.CellFormatting += MonitorDataGridView_CellFormatting;
 
                     //产量统计
-                    int daycount = dailyEntity.Count(x => x.StartTime >= DayStartTime && x.StartTime <= DayEndTine);
+                    int daycount = dailyEntity.Count(x => x.StartTime >= DayStartTime && x.StartTime <= DayEndTine && x.IsDone == 1);
                     DayProductNumTextBox.Text = daycount.ToString();
-                    int nightcount = dailyEntity.Count(x => x.StartTime >= NightStartTime && x.StartTime <= NightEndTime);
+                    int nightcount = dailyEntity.Count(x => x.StartTime >= NightStartTime && x.StartTime <= NightEndTime && x.IsDone == 1);
                     NightProductNumTextBox.Text = nightcount.ToString();
-                    NowDateProductNumTextBox.Text = dailyEntity.Count(x => x.StartTime >= LastDayStartTime && x.StartTime <= LastNightEndTime).ToString();
+                    NowDateProductNumTextBox.Text = dailyEntity.Count(x => x.StartTime >= LastDayStartTime && x.StartTime <= LastNightEndTime && x.IsDone == 1).ToString();
 
                     //称重信息显示
                     ZxDailyReportEntity first = dailyEntity.FirstOrDefault(x => x.IsDone == 1);
@@ -262,6 +262,7 @@ namespace HighWayIot.Winform.UserControlPages
                     }
                     RgvNoLabel.Text = first.DeviceNo.ToString();
                     ReweightLabel.Text = (first.RepeatWeight ?? 0).ToString();
+                    DeviceNoLabel.Text = first.VulcanizationNo;
                 }
                 catch(Exception ex)
                 {
diff --git a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.resx b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.resx
index ebcff35..6d7206a 100644
--- a/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.resx
+++ b/HighWayIot.Winform/UserControlPages/MonitorMainPages/MonitorMainPage.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="No.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -165,9 +168,6 @@
   <metadata name="MoveText.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="MoveText.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>44</value>
   </metadata>