整体质量报表 增加单独的tab

DK.Client/ReportModule/R04/M01/F_RPT_040109.Designer.cs

@@ -68,6 +68,20 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             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 dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dropKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
             this.lblKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.dropRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
@@ -115,6 +129,20 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.g4QualifiedRate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g4NonQualified7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.g4NonQualified6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tabpTQ1 = new System.Windows.Forms.TabPage();
+            this.dgvTQ1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvTQ)).BeginInit();
@@ -126,6 +154,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             ((System.ComponentModel.ISupportInitialize)(this.dgvDR)).BeginInit();
             this.tabpDL.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDL)).BeginInit();
+            this.tabpTQ1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvTQ1)).BeginInit();
             this.SuspendLayout();
             // 
             // dropKilnCode
@@ -564,6 +594,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.tabcData.Controls.Add(this.tabpFR);
             this.tabcData.Controls.Add(this.tabpDR);
             this.tabcData.Controls.Add(this.tabpDL);
+            this.tabcData.Controls.Add(this.tabpTQ1);
             this.tabcData.Location = new System.Drawing.Point(0, 98);
             this.tabcData.Name = "tabcData";
             this.tabcData.SelectedIndex = 0;
@@ -916,6 +947,228 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.g4NonQualified6.Name = "g4NonQualified6";
             this.g4NonQualified6.ReadOnly = true;
             // 
+            // tabpTQ1
+            // 
+            this.tabpTQ1.Controls.Add(this.dgvTQ1);
+            this.tabpTQ1.Location = new System.Drawing.Point(4, 22);
+            this.tabpTQ1.Name = "tabpTQ1";
+            this.tabpTQ1.Size = new System.Drawing.Size(1111, 351);
+            this.tabpTQ1.TabIndex = 4;
+            this.tabpTQ1.Text = "整体质量(挂厕)";
+            this.tabpTQ1.UseVisualStyleBackColor = true;
+            // 
+            // dgvTQ1
+            // 
+            this.dgvTQ1.AllowUserToAddRows = false;
+            this.dgvTQ1.AllowUserToDeleteRows = false;
+            this.dgvTQ1.AllowUserToModifyRows = true;
+            this.dgvTQ1.AllowUserToOrderColumns = true;
+            this.dgvTQ1.AllowUserToSortRows = false;
+            dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvTQ1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle29;
+            this.dgvTQ1.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvTQ1.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvTQ1.CellHeight = 23;
+            this.dgvTQ1.ChildNodeColumnName = null;
+            this.dgvTQ1.ChildNodeColumnText = null;
+            this.dgvTQ1.ColumnDeep = 1;
+            this.dgvTQ1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle30.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvTQ1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle30;
+            this.dgvTQ1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvTQ1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7,
+            this.dataGridViewTextBoxColumn8,
+            this.dataGridViewTextBoxColumn9,
+            this.dataGridViewTextBoxColumn10,
+            this.dataGridViewTextBoxColumn11,
+            this.dataGridViewTextBoxColumn12});
+            this.dgvTQ1.ColumnTreeView = null;
+            this.dgvTQ1.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvTQ1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvTQ1.DynamicColumnName = "";
+            this.dgvTQ1.EnableHeadersVisualStyles = false;
+            this.dgvTQ1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvTQ1.FormatQuantityColumns = null;
+            this.dgvTQ1.HorizontalMergeColumn = null;
+            this.dgvTQ1.IsAutoCountSum = true;
+            this.dgvTQ1.IsAutoResizeColumns = false;
+            this.dgvTQ1.IsClickF12 = false;
+            this.dgvTQ1.IsOpenMergeCellFlag = false;
+            this.dgvTQ1.IsSubTotalFlag = false;
+            this.dgvTQ1.IsTopDeep = false;
+            this.dgvTQ1.Location = new System.Drawing.Point(0, 0);
+            this.dgvTQ1.MergeColumnNames = null;
+            this.dgvTQ1.MergeDetailColumnNames = null;
+            this.dgvTQ1.MergeDetailOnlyColumn = null;
+            this.dgvTQ1.MergeOnlyColumn = null;
+            this.dgvTQ1.MultiSelect = false;
+            this.dgvTQ1.Name = "dgvTQ1";
+            this.dgvTQ1.ReadOnly = true;
+            this.dgvTQ1.RefreshAtHscroll = false;
+            this.dgvTQ1.RowHeadersWidth = 50;
+            this.dgvTQ1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvTQ1.RowsDefaultCellStyle = dataGridViewCellStyle42;
+            this.dgvTQ1.RowTemplate.Height = 21;
+            this.dgvTQ1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvTQ1.Size = new System.Drawing.Size(1111, 351);
+            this.dgvTQ1.SortOrderColumnName = null;
+            this.dgvTQ1.TabIndex = 1;
+            this.dgvTQ1.Tag = "";
+            this.dgvTQ1.TotalSumColumns = null;
+            this.dgvTQ1.ViewRowFilter = "";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "goodstypename2";
+            this.dataGridViewTextBoxColumn1.HeaderText = "产品类别";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "OutKilnCount";
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle31.Format = "N0";
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle31;
+            this.dataGridViewTextBoxColumn2.HeaderText = "出窑数";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "Qualified";
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle32.Format = "N0";
+            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle32;
+            this.dataGridViewTextBoxColumn3.HeaderText = "合格品";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "ReFireCount";
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle33.Format = "N0";
+            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle33;
+            this.dataGridViewTextBoxColumn4.HeaderText = "重烧";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "SubstandardCount";
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle34.Format = "N0";
+            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle34;
+            this.dataGridViewTextBoxColumn5.HeaderText = "次品";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "QualifiedRate";
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle35.Format = "p2";
+            dataGridViewCellStyle35.NullValue = "#DIV/0!";
+            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle35;
+            this.dataGridViewTextBoxColumn6.HeaderText = "合格率";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "ReFireRate";
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle36.Format = "p2";
+            dataGridViewCellStyle36.NullValue = "#DIV/0!";
+            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle36;
+            this.dataGridViewTextBoxColumn7.HeaderText = "重烧率";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "SubstandardRate";
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle37.Format = "p2";
+            dataGridViewCellStyle37.NullValue = "#DIV/0!";
+            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle37;
+            this.dataGridViewTextBoxColumn8.HeaderText = "次品率";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "GoodCount";
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle38.Format = "N0";
+            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle38;
+            this.dataGridViewTextBoxColumn9.HeaderText = "正品";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn9.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "GoodRate";
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle39.Format = "p2";
+            dataGridViewCellStyle39.NullValue = "#DIV/0!";
+            this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle39;
+            this.dataGridViewTextBoxColumn10.HeaderText = "正品率";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            this.dataGridViewTextBoxColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn10.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "BadCount";
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle40.Format = "N0";
+            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle40;
+            this.dataGridViewTextBoxColumn11.HeaderText = "副品";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            this.dataGridViewTextBoxColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn11.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "BadRate";
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle41.Format = "p2";
+            dataGridViewCellStyle41.NullValue = "#DIV/0!";
+            this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle41;
+            this.dataGridViewTextBoxColumn12.HeaderText = "副品率";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            this.dataGridViewTextBoxColumn12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn12.Visible = false;
+            // 
             // F_RPT_040109
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -941,6 +1194,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             ((System.ComponentModel.ISupportInitialize)(this.dgvDR)).EndInit();
             this.tabpDL.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvDL)).EndInit();
+            this.tabpTQ1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvTQ1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -994,5 +1249,19 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         private System.Windows.Forms.DataGridViewTextBoxColumn g4QualifiedRate;
         private System.Windows.Forms.DataGridViewTextBoxColumn g4NonQualified7;
         private System.Windows.Forms.DataGridViewTextBoxColumn g4NonQualified6;
+        private System.Windows.Forms.TabPage tabpTQ1;
+        private Basics.BaseControls.C_DataGridView dgvTQ1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
     }
 }

DK.Client/ReportModule/R04/M01/F_RPT_040109.cs

@@ -95,6 +95,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 BindPage();
                 // 设置表格不自动创建列
                 this.dgvTQ.AutoGenerateColumns = false;
+                this.dgvTQ1.AutoGenerateColumns = false;
                 this.dgvFR.AutoGenerateColumns = false;
                 this.dgvDR.AutoGenerateColumns = false;
                 this.dgvDL.AutoGenerateColumns = false;
@@ -125,6 +126,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         private void tsbtnAdaptive_Click(object sender, EventArgs e)
         {
             this.dgvTQ.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
+            this.dgvTQ1.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
             this.dgvFR.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
             this.dgvDR.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
             this.dgvDL.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
@@ -163,6 +165,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 //this.tabcData.Enabled = false;
                 this.dgvFR.HorizontalMergeColumn = null;
                 this.dgvTQ.DataSource = null;
+                this.dgvTQ1.DataSource = null;
                 this.dgvFR.DataSource = this.g2DataTable;
                 this.dgvDR.DataSource = this.g3DataTable;
                 this.dgvDL.DataSource = null;
@@ -386,6 +389,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 }
 
                 this.dgvTQ.DataSource = dataSet.Tables["TQ"];
+                this.dgvTQ1.DataSource = dataSet.Tables["TQ1"];
                 this.dgvFR.DataSource = dataSet.Tables["FR"];
                 this.dgvDR.DataSource = dataSet.Tables["DR"];
                 this.dgvDL.DataSource = dataSet.Tables["DL"];
@@ -419,6 +423,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 this.btnClearCondition.Enabled = true;
                 this.tabcData.Enabled = true;
                 this.dgvTQ.Enabled = true;
+                this.dgvTQ1.Enabled = true;
                 this.dgvFR.Enabled = true;
                 this.dgvDR.Enabled = true;
                 this.dgvDL.Enabled = true;
@@ -560,6 +565,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 this.tabcData.SelectedIndex = 1;
                 this.tabcData.SelectedIndex = 2;
                 this.tabcData.SelectedIndex = 3;
+                this.tabcData.SelectedIndex = 4;
                 this.tabcData.SelectedIndex = si;
 
                 // 多个sheet页
@@ -570,14 +576,17 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 dgvList.Add(this.dgvFR);
                 dgvList.Add(this.dgvDR);
                 dgvList.Add(this.dgvDL);
+                dgvList.Add(this.dgvTQ1);
                 tvList.Add(null);
                 tvList.Add(this.dgvFR.ColumnTreeView[0]);
                 tvList.Add(this.dgvDR.ColumnTreeView[0]);
                 tvList.Add(null);
+                tvList.Add(null);
                 sheetList.Add(this.tabcData.TabPages[0].Text);
                 sheetList.Add(this.tabcData.TabPages[1].Text);
                 sheetList.Add(this.tabcData.TabPages[2].Text);
                 sheetList.Add(this.tabcData.TabPages[3].Text);
+                sheetList.Add(this.tabcData.TabPages[4].Text);
                 ExportExcel.Common.Instance.ExportExcel(dgvList, tvList, null, this.Text, this.Text, this.Font, "", this.Font, "", sheetList, true, true, true, this.dgvFR.IsTopDeep);
                 //ExportExcel.Common.Instance.ExportExcelOneSheet(dgvList, tvList, null, this.Text, this.Text, this.Font, "", this.Font, "", sheetList, true, true, this.dgvFR.IsTopDeep);
             }

DK.Client/ReportModule/R04/M01/F_RPT_040109.resx

@@ -221,6 +221,15 @@
   <metadata name="g4NonQualified6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" 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>56</value>
   </metadata>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -5140,7 +5140,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					return sre;
 				}
 
-				data.Tables[0].TableName = "TQ1";
+				data.Tables[0].TableName = "TQ";
 				data.Tables[1].TableName = "FR";
 				data.Tables[2].TableName = "DR";
 				data.Tables[3].TableName = "DL";
@@ -5275,7 +5275,8 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 
 				conn.Commit();
 
-                data1.Tables[0].TableName = "TQ";
+                //data.Tables[0].TableName = "TQ1";
+                data1.Tables[0].TableName = "TQ1";
                 data.Merge(data1.Tables[0]);
 
                 sre.Data = data;