lqnet/Api/MyConstants.cs

@@ -33,7 +33,7 @@ namespace lqnet.Api
     }
     public class VariablesGlobal
     {
-        public static string IP_PORT = "http://47.108.207.174:8190/";
+        public static string IP_PORT = "http://10.60.102.253:8190/";
         public static string USER_TOKEN = "";
     }
 }

lqnet/Forms/BaseForm.cs

@@ -99,7 +99,13 @@ namespace lqnet.Forms
                 //获取Controls实例
                 ControlsChange(this.Controls[0]);
             }
+            reInitComponent();
         }
 
+        protected virtual void reInitComponent()
+        {
+
+        }
+        
     }
 }

lqnet/Forms/MainForm.Designer.cs

@@ -57,6 +57,15 @@ namespace lqnet.Forms
             this.prodtDesig_sel = new System.Windows.Forms.TextBox();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
             this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.proceNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.CheckItemComboBox = new System.Windows.Forms.ComboBox();
             this.slectBt = new System.Windows.Forms.Button();
             this.selectFileBt = new System.Windows.Forms.Button();
@@ -68,41 +77,32 @@ namespace lqnet.Forms
             this.mergeCountTextbox = new System.Windows.Forms.NumericUpDown();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.dataGridView2 = new System.Windows.Forms.DataGridView();
+            this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.importColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.reportColListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.parseReportBtn = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.currentFilePath = new System.Windows.Forms.Label();
             this.choosedFileLabel = new System.Windows.Forms.Label();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.pageHelper2 = new lqnet.Utils.PageHelper2();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.linkLabel1 = new System.Windows.Forms.LinkLabel();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.pageHelper2 = new lqnet.Utils.PageHelper2();
-            this.idDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtDesigDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.numDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupOrderCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.proceNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.prodtBatchDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupProceIdDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.groupProceCodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.taskListBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.indexDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.importColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.lineColLabelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewComboBoxColumn();
-            this.reportColListBindingSource = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).BeginInit();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).BeginInit();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // prodtDesig_sel
@@ -150,7 +150,7 @@ namespace lqnet.Forms
             this.dataGridView1.RowHeadersWidth = 82;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView1.ShowCellToolTips = false;
-            this.dataGridView1.Size = new System.Drawing.Size(1093, 396);
+            this.dataGridView1.Size = new System.Drawing.Size(1198, 396);
             this.dataGridView1.TabIndex = 2;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellClick);
             // 
@@ -163,6 +163,85 @@ namespace lqnet.Forms
             this.Index.ReadOnly = true;
             this.Index.Width = 110;
             // 
+            // idDataGridViewTextBoxColumn
+            // 
+            this.idDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderId";
+            this.idDataGridViewTextBoxColumn.HeaderText = "调度单id";
+            this.idDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
+            this.idDataGridViewTextBoxColumn.ReadOnly = true;
+            this.idDataGridViewTextBoxColumn.Visible = false;
+            this.idDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // prodtDesigDataGridViewTextBoxColumn
+            // 
+            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
+            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
+            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
+            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtDesigDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // numDataGridViewTextBoxColumn
+            // 
+            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
+            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
+            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
+            this.numDataGridViewTextBoxColumn.ReadOnly = true;
+            this.numDataGridViewTextBoxColumn.Width = 110;
+            // 
+            // groupOrderCodeDataGridViewTextBoxColumn
+            // 
+            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
+            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
+            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
+            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // proceNameDataGridViewTextBoxColumn
+            // 
+            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
+            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
+            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
+            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
+            this.proceNameDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // prodtBatchDataGridViewTextBoxColumn
+            // 
+            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
+            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
+            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
+            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
+            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
+            // 
+            // groupProceIdDataGridViewTextBoxColumn
+            // 
+            this.groupProceIdDataGridViewTextBoxColumn.DataPropertyName = "GroupProceId";
+            this.groupProceIdDataGridViewTextBoxColumn.HeaderText = "工序id";
+            this.groupProceIdDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceIdDataGridViewTextBoxColumn.Name = "groupProceIdDataGridViewTextBoxColumn";
+            this.groupProceIdDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceIdDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceIdDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // groupProceCodeDataGridViewTextBoxColumn
+            // 
+            this.groupProceCodeDataGridViewTextBoxColumn.DataPropertyName = "ProceCode";
+            this.groupProceCodeDataGridViewTextBoxColumn.HeaderText = "工序编号";
+            this.groupProceCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
+            this.groupProceCodeDataGridViewTextBoxColumn.Name = "groupProceCodeDataGridViewTextBoxColumn";
+            this.groupProceCodeDataGridViewTextBoxColumn.ReadOnly = true;
+            this.groupProceCodeDataGridViewTextBoxColumn.Visible = false;
+            this.groupProceCodeDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // taskListBindingSource
+            // 
+            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
+            // 
             // CheckItemComboBox
             // 
             this.CheckItemComboBox.DisplayMember = "checkName";
@@ -196,6 +275,7 @@ namespace lqnet.Forms
             // 
             // selectFileBt
             // 
+            this.selectFileBt.AutoSize = true;
             this.selectFileBt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.selectFileBt.FlatAppearance.BorderSize = 0;
             this.selectFileBt.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -213,6 +293,7 @@ namespace lqnet.Forms
             // 
             // uploadTrueBt
             // 
+            this.uploadTrueBt.AutoSize = true;
             this.uploadTrueBt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.uploadTrueBt.FlatAppearance.BorderSize = 0;
             this.uploadTrueBt.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -289,7 +370,7 @@ namespace lqnet.Forms
             this.groupBox1.Controls.Add(this.dataGridView2);
             this.groupBox1.Location = new System.Drawing.Point(286, 119);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(802, 420);
+            this.groupBox1.Size = new System.Drawing.Size(926, 420);
             this.groupBox1.TabIndex = 33;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "报告索引信息";
@@ -300,9 +381,9 @@ namespace lqnet.Forms
             this.dataGridView2.AutoGenerateColumns = false;
             this.dataGridView2.BackgroundColor = System.Drawing.Color.SkyBlue;
             this.dataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 14F);
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F);
             this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
-            this.dataGridView2.ColumnHeadersHeight = 40;
+            this.dataGridView2.ColumnHeadersHeight = 30;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.indexDataGridViewTextBoxColumn,
             this.importColLabelDataGridViewTextBoxColumn,
@@ -318,11 +399,40 @@ namespace lqnet.Forms
             this.dataGridView2.RowTemplate.Height = 50;
             this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dataGridView2.ShowCellToolTips = false;
-            this.dataGridView2.Size = new System.Drawing.Size(781, 391);
+            this.dataGridView2.Size = new System.Drawing.Size(913, 391);
             this.dataGridView2.TabIndex = 34;
             // 
+            // indexDataGridViewTextBoxColumn
+            // 
+            this.indexDataGridViewTextBoxColumn.DataPropertyName = "Index";
+            this.indexDataGridViewTextBoxColumn.HeaderText = "序号";
+            this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
+            this.indexDataGridViewTextBoxColumn.Width = 150;
+            // 
+            // importColLabelDataGridViewTextBoxColumn
+            // 
+            this.importColLabelDataGridViewTextBoxColumn.DataPropertyName = "importColLabel";
+            this.importColLabelDataGridViewTextBoxColumn.HeaderText = "导入报告列标签";
+            this.importColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.importColLabelDataGridViewTextBoxColumn.Name = "importColLabelDataGridViewTextBoxColumn";
+            this.importColLabelDataGridViewTextBoxColumn.Width = 300;
+            // 
+            // lineColLabelDataGridViewTextBoxColumn
+            // 
+            this.lineColLabelDataGridViewTextBoxColumn.DataPropertyName = "cellEn";
+            this.lineColLabelDataGridViewTextBoxColumn.HeaderText = "线上指标名称";
+            this.lineColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
+            this.lineColLabelDataGridViewTextBoxColumn.Name = "lineColLabelDataGridViewTextBoxColumn";
+            this.lineColLabelDataGridViewTextBoxColumn.Width = 400;
+            // 
+            // reportColListBindingSource
+            // 
+            this.reportColListBindingSource.DataSource = typeof(lqnet.Entities.ReportCol);
+            // 
             // parseReportBtn
             // 
+            this.parseReportBtn.AutoSize = true;
             this.parseReportBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.parseReportBtn.FlatAppearance.BorderSize = 0;
             this.parseReportBtn.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -376,11 +486,25 @@ namespace lqnet.Forms
             this.groupBox2.Controls.Add(this.slectBt);
             this.groupBox2.Location = new System.Drawing.Point(3, 0);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(1101, 557);
+            this.groupBox2.Size = new System.Drawing.Size(1206, 538);
             this.groupBox2.TabIndex = 0;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "选择调度单";
             // 
+            // pageHelper2
+            // 
+            this.pageHelper2.AllPage = 1;
+            this.pageHelper2.AutoScroll = true;
+            this.pageHelper2.Location = new System.Drawing.Point(379, 484);
+            this.pageHelper2.Margin = new System.Windows.Forms.Padding(2);
+            this.pageHelper2.Name = "pageHelper2";
+            this.pageHelper2.NowPage = 1;
+            this.pageHelper2.PageSize = 5;
+            this.pageHelper2.Size = new System.Drawing.Size(829, 56);
+            this.pageHelper2.TabIndex = 20;
+            this.pageHelper2.Total = 0;
+            this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
+            // 
             // groupBox3
             // 
             this.groupBox3.Controls.Add(this.groupBox1);
@@ -395,9 +519,9 @@ namespace lqnet.Forms
             this.groupBox3.Controls.Add(this.startIdxTextbox);
             this.groupBox3.Controls.Add(this.mergeCountLabel);
             this.groupBox3.Controls.Add(this.checkLabel);
-            this.groupBox3.Location = new System.Drawing.Point(12, 562);
+            this.groupBox3.Location = new System.Drawing.Point(3, 545);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(1101, 548);
+            this.groupBox3.Size = new System.Drawing.Size(1215, 548);
             this.groupBox3.TabIndex = 39;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "数据配置";
@@ -408,9 +532,10 @@ namespace lqnet.Forms
             this.panel1.Controls.Add(this.linkLabel1);
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label2);
-            this.panel1.Location = new System.Drawing.Point(6, 1101);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(0, 1093);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1101, 48);
+            this.panel1.Size = new System.Drawing.Size(1218, 59);
             this.panel1.TabIndex = 40;
             // 
             // linkLabel1
@@ -448,157 +573,37 @@ namespace lqnet.Forms
             // 
             // panel2
             // 
+            this.panel2.AutoScroll = true;
             this.panel2.Controls.Add(this.groupBox2);
             this.panel2.Controls.Add(this.panel1);
             this.panel2.Controls.Add(this.groupBox3);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel2.Location = new System.Drawing.Point(0, 0);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1112, 568);
+            this.panel2.Size = new System.Drawing.Size(1238, 744);
             this.panel2.TabIndex = 41;
             // 
-            // pageHelper2
-            // 
-            this.pageHelper2.AllPage = 1;
-            this.pageHelper2.AutoScroll = true;
-            this.pageHelper2.Location = new System.Drawing.Point(290, 482);
-            this.pageHelper2.Margin = new System.Windows.Forms.Padding(2);
-            this.pageHelper2.Name = "pageHelper2";
-            this.pageHelper2.NowPage = 1;
-            this.pageHelper2.PageSize = 5;
-            this.pageHelper2.Size = new System.Drawing.Size(811, 56);
-            this.pageHelper2.TabIndex = 20;
-            this.pageHelper2.Total = 0;
-            this.pageHelper2.Load += new System.EventHandler(this.PageHelper2_Load);
-            // 
-            // idDataGridViewTextBoxColumn
-            // 
-            this.idDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderId";
-            this.idDataGridViewTextBoxColumn.HeaderText = "调度单id";
-            this.idDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.idDataGridViewTextBoxColumn.Name = "idDataGridViewTextBoxColumn";
-            this.idDataGridViewTextBoxColumn.ReadOnly = true;
-            this.idDataGridViewTextBoxColumn.Visible = false;
-            this.idDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // prodtDesigDataGridViewTextBoxColumn
-            // 
-            this.prodtDesigDataGridViewTextBoxColumn.DataPropertyName = "ProdtDesig";
-            this.prodtDesigDataGridViewTextBoxColumn.HeaderText = "产品代号";
-            this.prodtDesigDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtDesigDataGridViewTextBoxColumn.Name = "prodtDesigDataGridViewTextBoxColumn";
-            this.prodtDesigDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtDesigDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // numDataGridViewTextBoxColumn
-            // 
-            this.numDataGridViewTextBoxColumn.DataPropertyName = "PlanAmt";
-            this.numDataGridViewTextBoxColumn.HeaderText = "数量";
-            this.numDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.numDataGridViewTextBoxColumn.Name = "numDataGridViewTextBoxColumn";
-            this.numDataGridViewTextBoxColumn.ReadOnly = true;
-            this.numDataGridViewTextBoxColumn.Width = 110;
-            // 
-            // groupOrderCodeDataGridViewTextBoxColumn
-            // 
-            this.groupOrderCodeDataGridViewTextBoxColumn.DataPropertyName = "GroupOrderCode";
-            this.groupOrderCodeDataGridViewTextBoxColumn.HeaderText = "调度单号";
-            this.groupOrderCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Name = "groupOrderCodeDataGridViewTextBoxColumn";
-            this.groupOrderCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupOrderCodeDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // proceNameDataGridViewTextBoxColumn
-            // 
-            this.proceNameDataGridViewTextBoxColumn.DataPropertyName = "ProceName";
-            this.proceNameDataGridViewTextBoxColumn.HeaderText = "工序名称";
-            this.proceNameDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.proceNameDataGridViewTextBoxColumn.Name = "proceNameDataGridViewTextBoxColumn";
-            this.proceNameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.proceNameDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // prodtBatchDataGridViewTextBoxColumn
-            // 
-            this.prodtBatchDataGridViewTextBoxColumn.DataPropertyName = "ProdtBatch";
-            this.prodtBatchDataGridViewTextBoxColumn.HeaderText = "生产批次";
-            this.prodtBatchDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.prodtBatchDataGridViewTextBoxColumn.Name = "prodtBatchDataGridViewTextBoxColumn";
-            this.prodtBatchDataGridViewTextBoxColumn.ReadOnly = true;
-            this.prodtBatchDataGridViewTextBoxColumn.Width = 290;
-            // 
-            // groupProceIdDataGridViewTextBoxColumn
-            // 
-            this.groupProceIdDataGridViewTextBoxColumn.DataPropertyName = "GroupProceId";
-            this.groupProceIdDataGridViewTextBoxColumn.HeaderText = "工序id";
-            this.groupProceIdDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupProceIdDataGridViewTextBoxColumn.Name = "groupProceIdDataGridViewTextBoxColumn";
-            this.groupProceIdDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupProceIdDataGridViewTextBoxColumn.Visible = false;
-            this.groupProceIdDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // groupProceCodeDataGridViewTextBoxColumn
-            // 
-            this.groupProceCodeDataGridViewTextBoxColumn.DataPropertyName = "ProceCode";
-            this.groupProceCodeDataGridViewTextBoxColumn.HeaderText = "工序编号";
-            this.groupProceCodeDataGridViewTextBoxColumn.MinimumWidth = 10;
-            this.groupProceCodeDataGridViewTextBoxColumn.Name = "groupProceCodeDataGridViewTextBoxColumn";
-            this.groupProceCodeDataGridViewTextBoxColumn.ReadOnly = true;
-            this.groupProceCodeDataGridViewTextBoxColumn.Visible = false;
-            this.groupProceCodeDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // taskListBindingSource
-            // 
-            this.taskListBindingSource.DataSource = typeof(lqnet.Entities.Tasks);
-            // 
-            // indexDataGridViewTextBoxColumn
-            // 
-            this.indexDataGridViewTextBoxColumn.DataPropertyName = "Index";
-            this.indexDataGridViewTextBoxColumn.HeaderText = "序号";
-            this.indexDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.indexDataGridViewTextBoxColumn.Name = "indexDataGridViewTextBoxColumn";
-            this.indexDataGridViewTextBoxColumn.ReadOnly = true;
-            this.indexDataGridViewTextBoxColumn.Width = 150;
-            // 
-            // importColLabelDataGridViewTextBoxColumn
-            // 
-            this.importColLabelDataGridViewTextBoxColumn.DataPropertyName = "importColLabel";
-            this.importColLabelDataGridViewTextBoxColumn.HeaderText = "导入报告列标签";
-            this.importColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.importColLabelDataGridViewTextBoxColumn.Name = "importColLabelDataGridViewTextBoxColumn";
-            this.importColLabelDataGridViewTextBoxColumn.ReadOnly = true;
-            this.importColLabelDataGridViewTextBoxColumn.Width = 250;
-            // 
-            // lineColLabelDataGridViewTextBoxColumn
-            // 
-            this.lineColLabelDataGridViewTextBoxColumn.DataPropertyName = "cellEn";
-            this.lineColLabelDataGridViewTextBoxColumn.HeaderText = "线上指标名称";
-            this.lineColLabelDataGridViewTextBoxColumn.MinimumWidth = 8;
-            this.lineColLabelDataGridViewTextBoxColumn.Name = "lineColLabelDataGridViewTextBoxColumn";
-            this.lineColLabelDataGridViewTextBoxColumn.Width = 250;
-            // 
-            // reportColListBindingSource
-            // 
-            this.reportColListBindingSource.DataSource = typeof(lqnet.Entities.ReportCol);
-            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoScroll = true;
-            this.ClientSize = new System.Drawing.Size(1112, 568);
+            this.ClientSize = new System.Drawing.Size(1238, 744);
             this.Controls.Add(this.panel2);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = global::lqnet.Properties.Resources.favicon;
-            this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(1360, 1500);
             this.Name = "MainForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "TDM测试台数据传输终端";
             this.Load += new System.EventHandler(this.Main_Load);
             this.Shown += new System.EventHandler(this.MainForm_Shown);
             this.Paint += new System.Windows.Forms.PaintEventHandler(this.Boder_Paint);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mergeCountTextbox)).EndInit();
             this.groupBox1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).EndInit();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox3.ResumeLayout(false);
@@ -606,8 +611,6 @@ namespace lqnet.Forms
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.taskListBindingSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.reportColListBindingSource)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -630,9 +633,6 @@ namespace lqnet.Forms
         private DataGridView dataGridView2;
         private Button parseReportBtn;
         private BindingSource reportColListBindingSource;
-        private DataGridViewTextBoxColumn indexDataGridViewTextBoxColumn;
-        private DataGridViewTextBoxColumn importColLabelDataGridViewTextBoxColumn;
-        private DataGridViewComboBoxColumn lineColLabelDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn Index;
         private DataGridViewTextBoxColumn idDataGridViewTextBoxColumn;
         private DataGridViewTextBoxColumn prodtDesigDataGridViewTextBoxColumn;
@@ -652,5 +652,8 @@ namespace lqnet.Forms
         private Label label3;
         private Label label2;
         private Panel panel2;
+        private DataGridViewTextBoxColumn indexDataGridViewTextBoxColumn;
+        private DataGridViewTextBoxColumn importColLabelDataGridViewTextBoxColumn;
+        private DataGridViewComboBoxColumn lineColLabelDataGridViewTextBoxColumn;
     }
 }

lqnet/Forms/MainForm.cs

@@ -22,7 +22,7 @@ using Org.BouncyCastle.Pqc.Crypto.Lms;
 
 namespace lqnet.Forms
 {
-    public partial class MainForm : Form
+    public partial class MainForm : BaseForm
     {
         /// <summary>
         /// 登录窗体
@@ -75,6 +75,7 @@ namespace lqnet.Forms
             this.Visible = false;
             this._device = device;
             InitializeComponent();
+            this.GetAllInitInfo(this.Controls[0]);
         }
 
         /// <summary>
@@ -301,7 +302,6 @@ namespace lqnet.Forms
         /// <param name="e"></param>
         private void PageHelper2_Load(object sender, EventArgs e)
         {
-            this.pageHelper2.reInitComponent();
             this.pageHelper2.PageSize = 10;
             this.pageHelper2.FirstPageClicek += new Utils.PageHelper2.FirstPageClicekHandle(PageHelper2_FirstPageClicek);
             this.pageHelper2.LastPageClick += new Utils.PageHelper2.LastPageClickHandle(PageHelper2_LastPageClick);
@@ -309,7 +309,7 @@ namespace lqnet.Forms
             this.pageHelper2.NextPageClick += new Utils.PageHelper2.NextPageHandle(PageHelper2_NextPageClick);
         }
 
-        private void reInitComponent()
+        protected override void reInitComponent()
         {
             int radius = 2;
             //绘制按钮圆角
@@ -345,6 +345,11 @@ namespace lqnet.Forms
             path5.AddArc(rect5.X + rect5.Width - radius, rect5.Y + rect5.Height - radius, radius, radius, 0, 90);
             path5.AddArc(rect5.X, rect5.Y + rect5.Height - radius, radius, radius, 90, 90);
             this.uploadTrueBt.Region = new Region(path5);
+
+
+            this.pageHelper2.reInitComponent();
+
+            CenterToScreen();
         }
 
         private void PageHelper2_LastPageClick(object sender, EventArgs e)
@@ -926,5 +931,22 @@ namespace lqnet.Forms
         {
             this.prodtDesig_sel.Text = string.Empty;
         }
+
+        /// <summary>
+        /// 计算窗口的居中位置
+        /// </summary>
+        private void CenterToScreen()
+        {
+            int screenWidth = Screen.PrimaryScreen.Bounds.Width;
+            int screenHeight = Screen.PrimaryScreen.Bounds.Height;
+
+            int formWidth = this.Width;
+            int formHeight = this.Height;
+
+            int left = (screenWidth - formWidth) / 2;
+            int top = (screenHeight - formHeight) / 2;
+
+            this.Location = new Point(left, top);
+        }
     }
 }

lqnet/Utils/PageHelper2.Designer.cs

@@ -102,6 +102,7 @@ namespace lqnet.Utils
             // 
             // btFirstPage
             // 
+            this.btFirstPage.AutoSize = true;
             this.btFirstPage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.btFirstPage.FlatAppearance.BorderSize = 0;
             this.btFirstPage.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -119,6 +120,7 @@ namespace lqnet.Utils
             // 
             // btPreviousPage
             // 
+            this.btPreviousPage.AutoSize = true;
             this.btPreviousPage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.btPreviousPage.FlatAppearance.BorderSize = 0;
             this.btPreviousPage.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -136,6 +138,7 @@ namespace lqnet.Utils
             // 
             // btNextPage
             // 
+            this.btNextPage.AutoSize = true;
             this.btNextPage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.btNextPage.FlatAppearance.BorderSize = 0;
             this.btNextPage.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
@@ -153,6 +156,7 @@ namespace lqnet.Utils
             // 
             // btLastPage
             // 
+            this.btLastPage.AutoSize = true;
             this.btLastPage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(124)))), ((int)(((byte)(255)))));
             this.btLastPage.FlatAppearance.BorderSize = 0;
             this.btLastPage.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

lqnet/bin/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>3CcGo3xk0thsifohcoZKf+srtMTSwDIhgoOXe9O40zs=</dsig:DigestValue>
+        <dsig:DigestValue>QOMToXMgk3Jab1aeNY6+O3ywqdjgBbO1foS1IwMzv+I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/bin/Debug/lqnet.exe.manifest

@@ -85,7 +85,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>CZP2Va/HJgBYp2ZmuL15iNNHkEsii6h+8UCux4C2dks=</dsig:DigestValue>
+        <dsig:DigestValue>JXAJASejmtcim8IST7vaIWb+eInRPH+cavMA9M3VQZ8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>3CcGo3xk0thsifohcoZKf+srtMTSwDIhgoOXe9O40zs=</dsig:DigestValue>
+        <dsig:DigestValue>QOMToXMgk3Jab1aeNY6+O3ywqdjgBbO1foS1IwMzv+I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

lqnet/obj/Debug/lqnet.exe.manifest

@@ -85,7 +85,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>CZP2Va/HJgBYp2ZmuL15iNNHkEsii6h+8UCux4C2dks=</dsig:DigestValue>
+        <dsig:DigestValue>JXAJASejmtcim8IST7vaIWb+eInRPH+cavMA9M3VQZ8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>