Quellcode durchsuchen

日期添加时分秒

林勇 冯 vor 3 Jahren
Ursprung
Commit
3efc381767

+ 502 - 463
DK.Client/ReportModule/R04/M01/F_RPT_040106.Designer.cs

@@ -28,357 +28,377 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040106));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            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();
-            this.dropKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
-            this.lblKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
-            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-            this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.chkOutKilnNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
-            this.dkProcedureSearchBox3 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-            this.txtDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-            this.txtDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-            this.lblDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.lblDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.lblRptProcedureName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dropRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
-            this.dgvRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.ProductionLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DefectPercent = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tsrOperate.SuspendLayout();
-            this.gbxCondition.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRptProcedure)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dropKilnCode
-            // 
-            this.dropKilnCode.BackColor = System.Drawing.SystemColors.Window;
-            this.dropKilnCode.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.dropKilnCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.dropKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dropKilnCode.FormattingEnabled = true;
-            this.dropKilnCode.Location = new System.Drawing.Point(694, 19);
-            this.dropKilnCode.Name = "dropKilnCode";
-            this.dropKilnCode.Size = new System.Drawing.Size(133, 20);
-            this.dropKilnCode.TabIndex = 7;
-            this.dropKilnCode.Visible = false;
-            // 
-            // lblKilnCode
-            // 
-            this.lblKilnCode.AutoSize = true;
-            this.lblKilnCode.BackColor = System.Drawing.SystemColors.Control;
-            this.lblKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblKilnCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblKilnCode.Location = new System.Drawing.Point(636, 23);
-            this.lblKilnCode.Name = "lblKilnCode";
-            this.lblKilnCode.Size = new System.Drawing.Size(53, 12);
-            this.lblKilnCode.TabIndex = 6;
-            this.lblKilnCode.Text = "窑炉编号";
-            this.lblKilnCode.Visible = false;
-            // 
-            // tsrOperate
-            // 
-            this.tsrOperate.AutoSize = false;
-            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040106));
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			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();
+			this.dropKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+			this.lblKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.chkOutKilnNum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
+			this.dkProcedureSearchBox3 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+			this.txtDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.txtDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.lblDefectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.lblDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.lblRptProcedureName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dropRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+			this.dgvRptProcedure = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.ProductionLineName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.procedurename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.goodstypename2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DefectCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.DefectPercent = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate.SuspendLayout();
+			this.gbxCondition.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvRptProcedure)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// dropKilnCode
+			// 
+			this.dropKilnCode.BackColor = System.Drawing.SystemColors.Window;
+			this.dropKilnCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.dropKilnCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.dropKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dropKilnCode.FormattingEnabled = true;
+			this.dropKilnCode.Location = new System.Drawing.Point(925, 24);
+			this.dropKilnCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dropKilnCode.Name = "dropKilnCode";
+			this.dropKilnCode.Size = new System.Drawing.Size(176, 23);
+			this.dropKilnCode.TabIndex = 7;
+			this.dropKilnCode.Visible = false;
+			// 
+			// lblKilnCode
+			// 
+			this.lblKilnCode.AutoSize = true;
+			this.lblKilnCode.BackColor = System.Drawing.SystemColors.Control;
+			this.lblKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblKilnCode.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblKilnCode.Location = new System.Drawing.Point(848, 29);
+			this.lblKilnCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblKilnCode.Name = "lblKilnCode";
+			this.lblKilnCode.Size = new System.Drawing.Size(67, 15);
+			this.lblKilnCode.TabIndex = 6;
+			this.lblKilnCode.Text = "窑炉编号";
+			this.lblKilnCode.Visible = false;
+			// 
+			// tsrOperate
+			// 
+			this.tsrOperate.AutoSize = false;
+			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrOperate.ImageScalingSize = new System.Drawing.Size(20, 20);
+			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnAdaptive,
             this.tsbtnClose});
-            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-            this.tsrOperate.Name = "tsrOperate";
-            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1131, 35);
-            this.tsrOperate.TabIndex = 0;
-            this.tsrOperate.Text = "toolStrip1";
-            // 
-            // tsbtnAdaptive
-            // 
-            this.tsbtnAdaptive.AutoSize = false;
-            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-            // 
-            // tsbtnClose
-            // 
-            this.tsbtnClose.AutoSize = false;
-            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnClose.Name = "tsbtnClose";
-            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-            this.tsbtnClose.Text = "关闭(&X)";
-            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-            // 
-            // lblAccountDateStart
-            // 
-            this.lblAccountDateStart.AutoSize = true;
-            this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateStart.Location = new System.Drawing.Point(242, 23);
-            this.lblAccountDateStart.Name = "lblAccountDateStart";
-            this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.lblAccountDateStart.Size = new System.Drawing.Size(53, 12);
-            this.lblAccountDateStart.TabIndex = 2;
-            this.lblAccountDateStart.Text = "登记日期";
-            // 
-            // lblAccountDateEnd
-            // 
-            this.lblAccountDateEnd.AutoSize = true;
-            this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateEnd.Location = new System.Drawing.Point(474, 23);
-            this.lblAccountDateEnd.Name = "lblAccountDateEnd";
-            this.lblAccountDateEnd.Size = new System.Drawing.Size(17, 12);
-            this.lblAccountDateEnd.TabIndex = 4;
-            this.lblAccountDateEnd.Text = "至";
-            // 
-            // dtpAccountDateEnd
-            // 
-            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateEnd.Location = new System.Drawing.Point(497, 19);
-            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
-            this.dtpAccountDateEnd.Size = new System.Drawing.Size(133, 21);
-            this.dtpAccountDateEnd.TabIndex = 5;
-            // 
-            // dtpAccountDateStart
-            // 
-            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateStart.Location = new System.Drawing.Point(301, 19);
-            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
-            this.dtpAccountDateStart.Size = new System.Drawing.Size(133, 21);
-            this.dtpAccountDateStart.TabIndex = 3;
-            // 
-            // gbxCondition
-            // 
-            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+			this.tsrOperate.Name = "tsrOperate";
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1508, 44);
+			this.tsrOperate.TabIndex = 0;
+			this.tsrOperate.Text = "toolStrip1";
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// lblAccountDateStart
+			// 
+			this.lblAccountDateStart.AutoSize = true;
+			this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
+			this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblAccountDateStart.Location = new System.Drawing.Point(323, 29);
+			this.lblAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblAccountDateStart.Name = "lblAccountDateStart";
+			this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.lblAccountDateStart.Size = new System.Drawing.Size(67, 15);
+			this.lblAccountDateStart.TabIndex = 2;
+			this.lblAccountDateStart.Text = "登记日期";
+			// 
+			// lblAccountDateEnd
+			// 
+			this.lblAccountDateEnd.AutoSize = true;
+			this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
+			this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblAccountDateEnd.Location = new System.Drawing.Point(632, 29);
+			this.lblAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblAccountDateEnd.Name = "lblAccountDateEnd";
+			this.lblAccountDateEnd.Size = new System.Drawing.Size(22, 15);
+			this.lblAccountDateEnd.TabIndex = 4;
+			this.lblAccountDateEnd.Text = "至";
+			// 
+			// dtpAccountDateEnd
+			// 
+			this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateEnd.Location = new System.Drawing.Point(663, 24);
+			this.dtpAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+			this.dtpAccountDateEnd.Size = new System.Drawing.Size(176, 25);
+			this.dtpAccountDateEnd.TabIndex = 5;
+			// 
+			// dtpAccountDateStart
+			// 
+			this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateStart.Location = new System.Drawing.Point(401, 24);
+			this.dtpAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+			this.dtpAccountDateStart.Size = new System.Drawing.Size(176, 25);
+			this.dtpAccountDateStart.TabIndex = 3;
+			// 
+			// gbxCondition
+			// 
+			this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
-            this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
-            this.gbxCondition.Controls.Add(this.chkOutKilnNum);
-            this.gbxCondition.Controls.Add(this.dkProcedureSearchBox3);
-            this.gbxCondition.Controls.Add(this.txtDefectName);
-            this.gbxCondition.Controls.Add(this.txtDefectCode);
-            this.gbxCondition.Controls.Add(this.lblDefectName);
-            this.gbxCondition.Controls.Add(this.lblDefectCode);
-            this.gbxCondition.Controls.Add(this.btnClearCondition);
-            this.gbxCondition.Controls.Add(this.btnSearch);
-            this.gbxCondition.Controls.Add(this.dropKilnCode);
-            this.gbxCondition.Controls.Add(this.lblKilnCode);
-            this.gbxCondition.Controls.Add(this.lblRptProcedureName);
-            this.gbxCondition.Controls.Add(this.dropRptProcedure);
-            this.gbxCondition.Controls.Add(this.lblAccountDateStart);
-            this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
-            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.gbxCondition.IsMustInput = false;
-            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
-            this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(1119, 73);
-            this.gbxCondition.TabIndex = 0;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
-            // 
-            // chkOutKilnNum
-            // 
-            this.chkOutKilnNum.AutoSize = true;
-            this.chkOutKilnNum.Checked = true;
-            this.chkOutKilnNum.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkOutKilnNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkOutKilnNum.Location = new System.Drawing.Point(694, 49);
-            this.chkOutKilnNum.Name = "chkOutKilnNum";
-            this.chkOutKilnNum.Size = new System.Drawing.Size(144, 16);
-            this.chkOutKilnNum.TabIndex = 15;
-            this.chkOutKilnNum.Text = "按产品类别统计出窑数";
-            this.chkOutKilnNum.UseVisualStyleBackColor = true;
-            // 
-            // dkProcedureSearchBox3
-            // 
-            this.dkProcedureSearchBox3.BackColor = System.Drawing.Color.Transparent;
-            this.dkProcedureSearchBox3.DataSource = null;
-            this.dkProcedureSearchBox3.Enabled = true;
-            this.dkProcedureSearchBox3.IsEnablePurview = false;
-            this.dkProcedureSearchBox3.IsMustInput = false;
-            this.dkProcedureSearchBox3.Location = new System.Drawing.Point(20, 45);
-            this.dkProcedureSearchBox3.ModelType = "-1";
-            this.dkProcedureSearchBox3.Name = "dkProcedureSearchBox3";
-            this.dkProcedureSearchBox3.ProcedureCode = "";
-            this.dkProcedureSearchBox3.ProcedureID = null;
-            this.dkProcedureSearchBox3.ProcedureIDS = null;
-            this.dkProcedureSearchBox3.ProcedureName = null;
-            this.dkProcedureSearchBox3.Purview = null;
-            this.dkProcedureSearchBox3.PurviewType = ((byte)(0));
-            this.dkProcedureSearchBox3.SelectMore = true;
-            this.dkProcedureSearchBox3.Size = new System.Drawing.Size(216, 21);
-            this.dkProcedureSearchBox3.TabIndex = 8;
-            this.dkProcedureSearchBox3.Title = "质量登记工序";
-            this.dkProcedureSearchBox3.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-            // 
-            // txtDefectName
-            // 
-            this.txtDefectName.BackColor = System.Drawing.SystemColors.Window;
-            this.txtDefectName.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtDefectName.ErrorMessage = "";
-            this.txtDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDefectName.Location = new System.Drawing.Point(497, 45);
-            this.txtDefectName.Name = "txtDefectName";
-            this.txtDefectName.Size = new System.Drawing.Size(133, 21);
-            this.txtDefectName.TabIndex = 12;
-            this.txtDefectName.TextValue = "";
-            // 
-            // txtDefectCode
-            // 
-            this.txtDefectCode.BackColor = System.Drawing.SystemColors.Window;
-            this.txtDefectCode.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtDefectCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.txtDefectCode.ErrorMessage = "";
-            this.txtDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDefectCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtDefectCode.Location = new System.Drawing.Point(301, 45);
-            this.txtDefectCode.MaxLength = 20;
-            this.txtDefectCode.Name = "txtDefectCode";
-            this.txtDefectCode.Size = new System.Drawing.Size(133, 21);
-            this.txtDefectCode.TabIndex = 10;
-            this.txtDefectCode.TextValue = "";
-            // 
-            // lblDefectName
-            // 
-            this.lblDefectName.AutoSize = true;
-            this.lblDefectName.BackColor = System.Drawing.Color.Transparent;
-            this.lblDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblDefectName.Location = new System.Drawing.Point(438, 49);
-            this.lblDefectName.Name = "lblDefectName";
-            this.lblDefectName.Size = new System.Drawing.Size(53, 12);
-            this.lblDefectName.TabIndex = 11;
-            this.lblDefectName.Text = "缺陷名称";
-            // 
-            // lblDefectCode
-            // 
-            this.lblDefectCode.AutoSize = true;
-            this.lblDefectCode.BackColor = System.Drawing.Color.Transparent;
-            this.lblDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblDefectCode.Location = new System.Drawing.Point(242, 49);
-            this.lblDefectCode.Name = "lblDefectCode";
-            this.lblDefectCode.Size = new System.Drawing.Size(53, 12);
-            this.lblDefectCode.TabIndex = 9;
-            this.lblDefectCode.Text = "缺陷编码";
-            // 
-            // btnClearCondition
-            // 
-            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
-            this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
-            this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(1028, 36);
-            this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
-            this.btnClearCondition.TabIndex = 14;
-            this.btnClearCondition.Text = "清空条件(&C)";
-            this.btnClearCondition.UseVisualStyleBackColor = true;
-            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
-            // 
-            // btnSearch
-            // 
-            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
-            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
-            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(937, 36);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
-            this.btnSearch.TabIndex = 13;
-            this.btnSearch.Text = "查询(&Q)";
-            this.btnSearch.UseVisualStyleBackColor = true;
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-            // 
-            // lblRptProcedureName
-            // 
-            this.lblRptProcedureName.AutoSize = true;
-            this.lblRptProcedureName.BackColor = System.Drawing.SystemColors.Control;
-            this.lblRptProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblRptProcedureName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.lblRptProcedureName.Location = new System.Drawing.Point(20, 23);
-            this.lblRptProcedureName.Name = "lblRptProcedureName";
-            this.lblRptProcedureName.Size = new System.Drawing.Size(77, 12);
-            this.lblRptProcedureName.TabIndex = 0;
-            this.lblRptProcedureName.Text = "数据来源名称";
-            // 
-            // dropRptProcedure
-            // 
-            this.dropRptProcedure.BackColor = System.Drawing.Color.Yellow;
-            this.dropRptProcedure.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.dropRptProcedure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.dropRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dropRptProcedure.FormattingEnabled = true;
-            this.dropRptProcedure.IsMustInput = true;
-            this.dropRptProcedure.Location = new System.Drawing.Point(103, 19);
-            this.dropRptProcedure.Name = "dropRptProcedure";
-            this.dropRptProcedure.Size = new System.Drawing.Size(133, 20);
-            this.dropRptProcedure.TabIndex = 1;
-            // 
-            // dgvRptProcedure
-            // 
-            this.dgvRptProcedure.AllowUserToAddRows = false;
-            this.dgvRptProcedure.AllowUserToDeleteRows = false;
-            this.dgvRptProcedure.AllowUserToModifyRows = true;
-            this.dgvRptProcedure.AllowUserToOrderColumns = true;
-            this.dgvRptProcedure.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvRptProcedure.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvRptProcedure.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.chkOutKilnNum);
+			this.gbxCondition.Controls.Add(this.dkProcedureSearchBox3);
+			this.gbxCondition.Controls.Add(this.txtDefectName);
+			this.gbxCondition.Controls.Add(this.txtDefectCode);
+			this.gbxCondition.Controls.Add(this.lblDefectName);
+			this.gbxCondition.Controls.Add(this.lblDefectCode);
+			this.gbxCondition.Controls.Add(this.btnClearCondition);
+			this.gbxCondition.Controls.Add(this.btnSearch);
+			this.gbxCondition.Controls.Add(this.dropKilnCode);
+			this.gbxCondition.Controls.Add(this.lblKilnCode);
+			this.gbxCondition.Controls.Add(this.lblRptProcedureName);
+			this.gbxCondition.Controls.Add(this.dropRptProcedure);
+			this.gbxCondition.Controls.Add(this.lblAccountDateStart);
+			this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.gbxCondition.IsMustInput = false;
+			this.gbxCondition.Location = new System.Drawing.Point(0, 48);
+			this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Name = "gbxCondition";
+			this.gbxCondition.OriginalHeight = -1;
+			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Size = new System.Drawing.Size(1492, 91);
+			this.gbxCondition.TabIndex = 0;
+			this.gbxCondition.TabStop = false;
+			this.gbxCondition.Text = "查询条件 ▼";
+			// 
+			// chkOutKilnNum
+			// 
+			this.chkOutKilnNum.AutoSize = true;
+			this.chkOutKilnNum.Checked = true;
+			this.chkOutKilnNum.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.chkOutKilnNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.chkOutKilnNum.Location = new System.Drawing.Point(925, 61);
+			this.chkOutKilnNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.chkOutKilnNum.Name = "chkOutKilnNum";
+			this.chkOutKilnNum.Size = new System.Drawing.Size(179, 19);
+			this.chkOutKilnNum.TabIndex = 15;
+			this.chkOutKilnNum.Text = "按产品类别统计出窑数";
+			this.chkOutKilnNum.UseVisualStyleBackColor = true;
+			// 
+			// dkProcedureSearchBox3
+			// 
+			this.dkProcedureSearchBox3.BackColor = System.Drawing.Color.Transparent;
+			this.dkProcedureSearchBox3.DataSource = null;
+			this.dkProcedureSearchBox3.Enabled = true;
+			this.dkProcedureSearchBox3.IsEnablePurview = false;
+			this.dkProcedureSearchBox3.IsMustInput = false;
+			this.dkProcedureSearchBox3.Location = new System.Drawing.Point(27, 56);
+			this.dkProcedureSearchBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.dkProcedureSearchBox3.ModelType = "-1";
+			this.dkProcedureSearchBox3.Name = "dkProcedureSearchBox3";
+			this.dkProcedureSearchBox3.ProcedureCode = "";
+			this.dkProcedureSearchBox3.ProcedureID = null;
+			this.dkProcedureSearchBox3.ProcedureIDS = null;
+			this.dkProcedureSearchBox3.ProcedureName = null;
+			this.dkProcedureSearchBox3.Purview = null;
+			this.dkProcedureSearchBox3.PurviewType = ((byte)(0));
+			this.dkProcedureSearchBox3.SelectMore = true;
+			this.dkProcedureSearchBox3.Size = new System.Drawing.Size(288, 26);
+			this.dkProcedureSearchBox3.TabIndex = 8;
+			this.dkProcedureSearchBox3.Title = "质量登记工序";
+			this.dkProcedureSearchBox3.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+			// 
+			// txtDefectName
+			// 
+			this.txtDefectName.BackColor = System.Drawing.SystemColors.Window;
+			this.txtDefectName.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtDefectName.ErrorMessage = "";
+			this.txtDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtDefectName.Location = new System.Drawing.Point(663, 56);
+			this.txtDefectName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtDefectName.Name = "txtDefectName";
+			this.txtDefectName.Size = new System.Drawing.Size(176, 25);
+			this.txtDefectName.TabIndex = 12;
+			this.txtDefectName.TextValue = "";
+			// 
+			// txtDefectCode
+			// 
+			this.txtDefectCode.BackColor = System.Drawing.SystemColors.Window;
+			this.txtDefectCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtDefectCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtDefectCode.ErrorMessage = "";
+			this.txtDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtDefectCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.txtDefectCode.Location = new System.Drawing.Point(401, 56);
+			this.txtDefectCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.txtDefectCode.MaxLength = 20;
+			this.txtDefectCode.Name = "txtDefectCode";
+			this.txtDefectCode.Size = new System.Drawing.Size(176, 25);
+			this.txtDefectCode.TabIndex = 10;
+			this.txtDefectCode.TextValue = "";
+			// 
+			// lblDefectName
+			// 
+			this.lblDefectName.AutoSize = true;
+			this.lblDefectName.BackColor = System.Drawing.Color.Transparent;
+			this.lblDefectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblDefectName.Location = new System.Drawing.Point(584, 61);
+			this.lblDefectName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblDefectName.Name = "lblDefectName";
+			this.lblDefectName.Size = new System.Drawing.Size(67, 15);
+			this.lblDefectName.TabIndex = 11;
+			this.lblDefectName.Text = "缺陷名称";
+			// 
+			// lblDefectCode
+			// 
+			this.lblDefectCode.AutoSize = true;
+			this.lblDefectCode.BackColor = System.Drawing.Color.Transparent;
+			this.lblDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblDefectCode.Location = new System.Drawing.Point(323, 61);
+			this.lblDefectCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblDefectCode.Name = "lblDefectCode";
+			this.lblDefectCode.Size = new System.Drawing.Size(67, 15);
+			this.lblDefectCode.TabIndex = 9;
+			this.lblDefectCode.Text = "缺陷编码";
+			// 
+			// btnClearCondition
+			// 
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
+			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+			this.btnClearCondition.Location = new System.Drawing.Point(1371, 45);
+			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnClearCondition.Name = "btnClearCondition";
+			this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
+			this.btnClearCondition.TabIndex = 14;
+			this.btnClearCondition.Text = "清空条件(&C)";
+			this.btnClearCondition.UseVisualStyleBackColor = true;
+			this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+			// 
+			// btnSearch
+			// 
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnSearch.ForeColor = System.Drawing.Color.White;
+			this.btnSearch.Location = new System.Drawing.Point(1249, 45);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSearch.Name = "btnSearch";
+			this.btnSearch.Size = new System.Drawing.Size(113, 38);
+			this.btnSearch.TabIndex = 13;
+			this.btnSearch.Text = "查询(&Q)";
+			this.btnSearch.UseVisualStyleBackColor = true;
+			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+			// 
+			// lblRptProcedureName
+			// 
+			this.lblRptProcedureName.AutoSize = true;
+			this.lblRptProcedureName.BackColor = System.Drawing.SystemColors.Control;
+			this.lblRptProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblRptProcedureName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.lblRptProcedureName.Location = new System.Drawing.Point(27, 29);
+			this.lblRptProcedureName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblRptProcedureName.Name = "lblRptProcedureName";
+			this.lblRptProcedureName.Size = new System.Drawing.Size(97, 15);
+			this.lblRptProcedureName.TabIndex = 0;
+			this.lblRptProcedureName.Text = "数据来源名称";
+			// 
+			// dropRptProcedure
+			// 
+			this.dropRptProcedure.BackColor = System.Drawing.Color.Yellow;
+			this.dropRptProcedure.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.dropRptProcedure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.dropRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dropRptProcedure.FormattingEnabled = true;
+			this.dropRptProcedure.IsMustInput = true;
+			this.dropRptProcedure.Location = new System.Drawing.Point(137, 24);
+			this.dropRptProcedure.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dropRptProcedure.Name = "dropRptProcedure";
+			this.dropRptProcedure.Size = new System.Drawing.Size(176, 23);
+			this.dropRptProcedure.TabIndex = 1;
+			// 
+			// dgvRptProcedure
+			// 
+			this.dgvRptProcedure.AllowUserToAddRows = false;
+			this.dgvRptProcedure.AllowUserToDeleteRows = false;
+			this.dgvRptProcedure.AllowUserToModifyRows = true;
+			this.dgvRptProcedure.AllowUserToOrderColumns = true;
+			this.dgvRptProcedure.AllowUserToSortRows = false;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvRptProcedure.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.dgvRptProcedure.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.dgvRptProcedure.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvRptProcedure.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvRptProcedure.CellHeight = 23;
-            this.dgvRptProcedure.ChildNodeColumnName = null;
-            this.dgvRptProcedure.ChildNodeColumnText = null;
-            this.dgvRptProcedure.ColumnDeep = 1;
-            this.dgvRptProcedure.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRptProcedure.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvRptProcedure.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvRptProcedure.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.dgvRptProcedure.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvRptProcedure.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvRptProcedure.CellHeight = 23;
+			this.dgvRptProcedure.ChildNodeColumnName = null;
+			this.dgvRptProcedure.ChildNodeColumnText = null;
+			this.dgvRptProcedure.ColumnDeep = 1;
+			this.dgvRptProcedure.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvRptProcedure.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+			this.dgvRptProcedure.ColumnHeadersHeight = 29;
+			this.dgvRptProcedure.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvRptProcedure.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.ProductionLineName,
             this.procedurename,
             this.Defectcode,
@@ -387,123 +407,142 @@
             this.OutKilnCount,
             this.DefectCount,
             this.DefectPercent});
-            this.dgvRptProcedure.ColumnTreeView = null;
-            this.dgvRptProcedure.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.dgvRptProcedure.DynamicColumnName = "";
-            this.dgvRptProcedure.EnableHeadersVisualStyles = false;
-            this.dgvRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvRptProcedure.HorizontalMergeColumn = null;
-            this.dgvRptProcedure.IsAutoCountSum = true;
-            this.dgvRptProcedure.IsAutoResizeColumns = false;
-            this.dgvRptProcedure.IsClickF12 = false;
-            this.dgvRptProcedure.IsOpenMergeCellFlag = false;
-            this.dgvRptProcedure.IsSubTotalFlag = false;
-            this.dgvRptProcedure.IsTopDeep = false;
-            this.dgvRptProcedure.Location = new System.Drawing.Point(0, 119);
-            this.dgvRptProcedure.MergeColumnNames = null;
-            this.dgvRptProcedure.MergeDetailColumnNames = null;
-            this.dgvRptProcedure.MergeDetailOnlyColumn = null;
-            this.dgvRptProcedure.MergeOnlyColumn = null;
-            this.dgvRptProcedure.MultiSelect = false;
-            this.dgvRptProcedure.Name = "dgvRptProcedure";
-            this.dgvRptProcedure.ReadOnly = true;
-            this.dgvRptProcedure.RefreshAtHscroll = false;
-            this.dgvRptProcedure.RowHeadersWidth = 50;
-            this.dgvRptProcedure.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvRptProcedure.RowsDefaultCellStyle = dataGridViewCellStyle6;
-            this.dgvRptProcedure.RowTemplate.Height = 21;
-            this.dgvRptProcedure.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRptProcedure.Size = new System.Drawing.Size(1119, 357);
-            this.dgvRptProcedure.SortOrderColumnName = null;
-            this.dgvRptProcedure.TabIndex = 2;
-            this.dgvRptProcedure.Tag = true;
-            this.dgvRptProcedure.TotalSumColumns = null;
-            this.dgvRptProcedure.ViewRowFilter = "";
-            this.dgvRptProcedure.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvRptProcedure_CellFormatting);
-            // 
-            // ProductionLineName
-            // 
-            this.ProductionLineName.DataPropertyName = "productionlinename";
-            this.ProductionLineName.HeaderText = "生产线";
-            this.ProductionLineName.Name = "ProductionLineName";
-            this.ProductionLineName.ReadOnly = true;
-            // 
-            // procedurename
-            // 
-            this.procedurename.DataPropertyName = "procedurename";
-            this.procedurename.HeaderText = "登记工序";
-            this.procedurename.Name = "procedurename";
-            this.procedurename.ReadOnly = true;
-            // 
-            // Defectcode
-            // 
-            this.Defectcode.DataPropertyName = "Defectcode";
-            this.Defectcode.HeaderText = "缺陷编码";
-            this.Defectcode.Name = "Defectcode";
-            this.Defectcode.ReadOnly = true;
-            // 
-            // Defectname
-            // 
-            this.Defectname.DataPropertyName = "Defectname";
-            this.Defectname.HeaderText = "缺陷名称";
-            this.Defectname.Name = "Defectname";
-            this.Defectname.ReadOnly = true;
-            // 
-            // goodstypename2
-            // 
-            this.goodstypename2.DataPropertyName = "goodstypename2";
-            this.goodstypename2.HeaderText = "产品二级类别";
-            this.goodstypename2.Name = "goodstypename2";
-            this.goodstypename2.ReadOnly = true;
-            // 
-            // OutKilnCount
-            // 
-            this.OutKilnCount.DataPropertyName = "OutKilnCount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle3;
-            this.OutKilnCount.HeaderText = "出窑数";
-            this.OutKilnCount.Name = "OutKilnCount";
-            this.OutKilnCount.ReadOnly = true;
-            // 
-            // DefectCount
-            // 
-            this.DefectCount.DataPropertyName = "DefectCount";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.DefectCount.DefaultCellStyle = dataGridViewCellStyle4;
-            this.DefectCount.HeaderText = "缺陷数量";
-            this.DefectCount.Name = "DefectCount";
-            this.DefectCount.ReadOnly = true;
-            // 
-            // DefectPercent
-            // 
-            this.DefectPercent.DataPropertyName = "DefectPercent";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Format = "p2";
-            dataGridViewCellStyle5.NullValue = "#DIV/0!";
-            this.DefectPercent.DefaultCellStyle = dataGridViewCellStyle5;
-            this.DefectPercent.HeaderText = "缺陷率";
-            this.DefectPercent.Name = "DefectPercent";
-            this.DefectPercent.ReadOnly = true;
-            // 
-            // F_RPT_040106
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1131, 476);
-            this.Controls.Add(this.dgvRptProcedure);
-            this.Controls.Add(this.tsrOperate);
-            this.Controls.Add(this.gbxCondition);
-            this.Name = "F_RPT_040106";
-            this.Text = "缺陷报表";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040104_FormClosed);
-            this.Load += new System.EventHandler(this.F_RPT_040104_Load);
-            this.tsrOperate.ResumeLayout(false);
-            this.tsrOperate.PerformLayout();
-            this.gbxCondition.ResumeLayout(false);
-            this.gbxCondition.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRptProcedure)).EndInit();
-            this.ResumeLayout(false);
+			this.dgvRptProcedure.ColumnTreeView = null;
+			this.dgvRptProcedure.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.dgvRptProcedure.DynamicColumnName = "";
+			this.dgvRptProcedure.EnableHeadersVisualStyles = false;
+			this.dgvRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvRptProcedure.FormatQuantityColumns = null;
+			this.dgvRptProcedure.HorizontalMergeColumn = null;
+			this.dgvRptProcedure.IsAutoCountSum = true;
+			this.dgvRptProcedure.IsAutoResizeColumns = false;
+			this.dgvRptProcedure.IsClickF12 = false;
+			this.dgvRptProcedure.IsOpenMergeCellFlag = false;
+			this.dgvRptProcedure.IsSubTotalFlag = false;
+			this.dgvRptProcedure.IsTopDeep = false;
+			this.dgvRptProcedure.Location = new System.Drawing.Point(0, 149);
+			this.dgvRptProcedure.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvRptProcedure.MergeColumnNames = null;
+			this.dgvRptProcedure.MergeDetailColumnNames = null;
+			this.dgvRptProcedure.MergeDetailOnlyColumn = null;
+			this.dgvRptProcedure.MergeOnlyColumn = null;
+			this.dgvRptProcedure.MultiSelect = false;
+			this.dgvRptProcedure.Name = "dgvRptProcedure";
+			this.dgvRptProcedure.ReadOnly = true;
+			this.dgvRptProcedure.RefreshAtHscroll = false;
+			this.dgvRptProcedure.RowHeadersWidth = 50;
+			this.dgvRptProcedure.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvRptProcedure.RowsDefaultCellStyle = dataGridViewCellStyle6;
+			this.dgvRptProcedure.RowTemplate.Height = 21;
+			this.dgvRptProcedure.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvRptProcedure.Size = new System.Drawing.Size(1492, 446);
+			this.dgvRptProcedure.SortOrderColumnName = null;
+			this.dgvRptProcedure.TabIndex = 2;
+			this.dgvRptProcedure.Tag = true;
+			this.dgvRptProcedure.TotalSumColumns = null;
+			this.dgvRptProcedure.ViewRowFilter = "";
+			this.dgvRptProcedure.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvRptProcedure_CellFormatting);
+			// 
+			// ProductionLineName
+			// 
+			this.ProductionLineName.DataPropertyName = "productionlinename";
+			this.ProductionLineName.HeaderText = "生产线";
+			this.ProductionLineName.MinimumWidth = 6;
+			this.ProductionLineName.Name = "ProductionLineName";
+			this.ProductionLineName.ReadOnly = true;
+			this.ProductionLineName.Width = 125;
+			// 
+			// procedurename
+			// 
+			this.procedurename.DataPropertyName = "procedurename";
+			this.procedurename.HeaderText = "登记工序";
+			this.procedurename.MinimumWidth = 6;
+			this.procedurename.Name = "procedurename";
+			this.procedurename.ReadOnly = true;
+			this.procedurename.Width = 125;
+			// 
+			// Defectcode
+			// 
+			this.Defectcode.DataPropertyName = "Defectcode";
+			this.Defectcode.HeaderText = "缺陷编码";
+			this.Defectcode.MinimumWidth = 6;
+			this.Defectcode.Name = "Defectcode";
+			this.Defectcode.ReadOnly = true;
+			this.Defectcode.Width = 125;
+			// 
+			// Defectname
+			// 
+			this.Defectname.DataPropertyName = "Defectname";
+			this.Defectname.HeaderText = "缺陷名称";
+			this.Defectname.MinimumWidth = 6;
+			this.Defectname.Name = "Defectname";
+			this.Defectname.ReadOnly = true;
+			this.Defectname.Width = 125;
+			// 
+			// goodstypename2
+			// 
+			this.goodstypename2.DataPropertyName = "goodstypename2";
+			this.goodstypename2.HeaderText = "产品二级类别";
+			this.goodstypename2.MinimumWidth = 6;
+			this.goodstypename2.Name = "goodstypename2";
+			this.goodstypename2.ReadOnly = true;
+			this.goodstypename2.Width = 125;
+			// 
+			// OutKilnCount
+			// 
+			this.OutKilnCount.DataPropertyName = "OutKilnCount";
+			dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle3;
+			this.OutKilnCount.HeaderText = "出窑数";
+			this.OutKilnCount.MinimumWidth = 6;
+			this.OutKilnCount.Name = "OutKilnCount";
+			this.OutKilnCount.ReadOnly = true;
+			this.OutKilnCount.Width = 125;
+			// 
+			// DefectCount
+			// 
+			this.DefectCount.DataPropertyName = "DefectCount";
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			this.DefectCount.DefaultCellStyle = dataGridViewCellStyle4;
+			this.DefectCount.HeaderText = "缺陷数量";
+			this.DefectCount.MinimumWidth = 6;
+			this.DefectCount.Name = "DefectCount";
+			this.DefectCount.ReadOnly = true;
+			this.DefectCount.Width = 125;
+			// 
+			// DefectPercent
+			// 
+			this.DefectPercent.DataPropertyName = "DefectPercent";
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle5.Format = "p2";
+			dataGridViewCellStyle5.NullValue = "#DIV/0!";
+			this.DefectPercent.DefaultCellStyle = dataGridViewCellStyle5;
+			this.DefectPercent.HeaderText = "缺陷率";
+			this.DefectPercent.MinimumWidth = 6;
+			this.DefectPercent.Name = "DefectPercent";
+			this.DefectPercent.ReadOnly = true;
+			this.DefectPercent.Width = 125;
+			// 
+			// F_RPT_040106
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1508, 595);
+			this.Controls.Add(this.dgvRptProcedure);
+			this.Controls.Add(this.tsrOperate);
+			this.Controls.Add(this.gbxCondition);
+			this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.Name = "F_RPT_040106";
+			this.Text = "缺陷报表";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040104_FormClosed);
+			this.Load += new System.EventHandler(this.F_RPT_040104_Load);
+			this.tsrOperate.ResumeLayout(false);
+			this.tsrOperate.PerformLayout();
+			this.gbxCondition.ResumeLayout(false);
+			this.gbxCondition.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvRptProcedure)).EndInit();
+			this.ResumeLayout(false);
 
         }
 

+ 2 - 2
DK.Client/ReportModule/R04/M01/F_RPT_040106.cs

@@ -216,8 +216,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 // 质量工序id
                 se.ProcedureIDS = dkProcedureSearchBox3.ProcedureIDS == null ? string.Empty : dkProcedureSearchBox3.ProcedureIDS;
 
-                se.CreateTimeStart = DateTime.Parse(this.dtpAccountDateStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");
-                se.CreateTimeEnd = DateTime.Parse(this.dtpAccountDateEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+                se.CreateTimeStart = this.dtpAccountDateStart.Value;
+                se.CreateTimeEnd = this.dtpAccountDateEnd.Value;
 
                 se.DefectCode = this.txtDefectCode.Text.Trim();
                 se.DefectName = this.txtDefectName.Text.Trim();

+ 14 - 21
DK.Client/ReportModule/R04/M01/F_RPT_040106.resx

@@ -168,37 +168,30 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAALxJREFUaEPt2KERxCAQRmEaRKJxtIBFURAV0AuOJjaDuMud3l2RyRM08M3/GJJQ
-        ShGO3qD3LnNO2XtLAFQPegxBdagTVFBt8vS+5lgqS2Wpr32ekT/5kz/580VlVwF3Kneq3Zo8PwD+lppz
-        Fo7eoLV2/6UCVA96DEF1qBNUB9Ra651/Skk4eoMP6lpLAqB60GMIqkOdoIJqk6f3NcdSWSpLfe3zjPzJ
-        /zn5jzGEx7/hYk/+X9QYo3D0Br+oFzyGRAVFGyByAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAALxJREFUaEPt2KERxCAQRmEaRKJxtIBFURAV0AuOJjaDuMud3l2RyRM08M3/GJJQ
-        ShGO3qD3LnNO2XtLAFQPegxBdagTVFBt8vS+5lgqS2Wpr32ekT/5kz/580VlVwF3Kneq3Zo8PwD+lppz
-        Fo7eoLV2/6UCVA96DEF1qBNUB9Ra651/Skk4eoMP6lpLAqB60GMIqkOdoIJqk6f3NcdSWSpLfe3zjPzJ
-        /zn5jzGEx7/hYk/+X9QYo3D0Br+oFzyGRAVFGyByAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="ProductionLineName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+ 549 - 503
DK.Client/ReportModule/R04/M01/F_RPT_040113.Designer.cs

@@ -28,222 +28,259 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040113));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
-            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-            this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.dgvRpt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.g1pcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1pname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1gtcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Qualified = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1defectcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g1ccp = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.dgvD = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.g2pcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g2pname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.g2gt2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.defectcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbGoodsType2 = new Dongke.WinForm.Controls.CmbComboBox();
-            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.tsrOperate.SuspendLayout();
-            this.gbxCondition.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tsrOperate
-            // 
-            this.tsrOperate.AutoSize = false;
-            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040113));
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = 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.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = 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 dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.cmbGoodsType2 = new Dongke.WinForm.Controls.CmbComboBox();
+			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.dgvRpt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.g1pcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g1pname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g1gtcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g1goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.OutKilnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Qualified = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g1defectcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g1ccp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.dgvD = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.g2pcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g2pname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.g2gt2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.defectcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate.SuspendLayout();
+			this.gbxCondition.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvD)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tsrOperate
+			// 
+			this.tsrOperate.AutoSize = false;
+			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrOperate.ImageScalingSize = new System.Drawing.Size(20, 20);
+			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbtnAdaptive,
             this.tsbtnClose});
-            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-            this.tsrOperate.Name = "tsrOperate";
-            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(824, 35);
-            this.tsrOperate.TabIndex = 36;
-            this.tsrOperate.Text = "toolStrip1";
-            // 
-            // tsbtnAdaptive
-            // 
-            this.tsbtnAdaptive.AutoSize = false;
-            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-            // 
-            // tsbtnClose
-            // 
-            this.tsbtnClose.AutoSize = false;
-            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbtnClose.Name = "tsbtnClose";
-            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-            this.tsbtnClose.Text = "关闭(&X)";
-            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-            // 
-            // lblAccountDateStart
-            // 
-            this.lblAccountDateStart.AutoSize = true;
-            this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
-            this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateStart.Location = new System.Drawing.Point(37, 24);
-            this.lblAccountDateStart.Name = "lblAccountDateStart";
-            this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.lblAccountDateStart.Size = new System.Drawing.Size(29, 12);
-            this.lblAccountDateStart.TabIndex = 7;
-            this.lblAccountDateStart.Text = "日期";
-            // 
-            // dtpAccountDateStart
-            // 
-            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateStart.Location = new System.Drawing.Point(72, 20);
-            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
-            this.dtpAccountDateStart.Size = new System.Drawing.Size(100, 21);
-            this.dtpAccountDateStart.TabIndex = 1;
-            // 
-            // btnClearCondition
-            // 
-            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
-            this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
-            this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(721, 20);
-            this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
-            this.btnClearCondition.TabIndex = 13;
-            this.btnClearCondition.Text = "清空条件(&C)";
-            this.btnClearCondition.UseVisualStyleBackColor = true;
-            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
-            // 
-            // btnSearch
-            // 
-            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
-            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
-            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(630, 20);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(85, 30);
-            this.btnSearch.TabIndex = 12;
-            this.btnSearch.Text = "查询(&Q)";
-            this.btnSearch.UseVisualStyleBackColor = true;
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-            // 
-            // gbxCondition
-            // 
-            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+			this.tsrOperate.Name = "tsrOperate";
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1099, 44);
+			this.tsrOperate.TabIndex = 36;
+			this.tsrOperate.Text = "toolStrip1";
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// lblAccountDateStart
+			// 
+			this.lblAccountDateStart.AutoSize = true;
+			this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
+			this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblAccountDateStart.Location = new System.Drawing.Point(49, 30);
+			this.lblAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.lblAccountDateStart.Name = "lblAccountDateStart";
+			this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.lblAccountDateStart.Size = new System.Drawing.Size(37, 15);
+			this.lblAccountDateStart.TabIndex = 7;
+			this.lblAccountDateStart.Text = "日期";
+			// 
+			// dtpAccountDateStart
+			// 
+			this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateStart.Location = new System.Drawing.Point(96, 25);
+			this.dtpAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+			this.dtpAccountDateStart.Size = new System.Drawing.Size(152, 25);
+			this.dtpAccountDateStart.TabIndex = 1;
+			// 
+			// btnClearCondition
+			// 
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
+			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+			this.btnClearCondition.Location = new System.Drawing.Point(961, 25);
+			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnClearCondition.Name = "btnClearCondition";
+			this.btnClearCondition.Size = new System.Drawing.Size(113, 38);
+			this.btnClearCondition.TabIndex = 13;
+			this.btnClearCondition.Text = "清空条件(&C)";
+			this.btnClearCondition.UseVisualStyleBackColor = true;
+			this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+			// 
+			// btnSearch
+			// 
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnSearch.ForeColor = System.Drawing.Color.White;
+			this.btnSearch.Location = new System.Drawing.Point(840, 25);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.btnSearch.Name = "btnSearch";
+			this.btnSearch.Size = new System.Drawing.Size(113, 38);
+			this.btnSearch.TabIndex = 12;
+			this.btnSearch.Text = "查询(&Q)";
+			this.btnSearch.UseVisualStyleBackColor = true;
+			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+			// 
+			// gbxCondition
+			// 
+			this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
-            this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
-            this.gbxCondition.Controls.Add(this.cmbGoodsType2);
-            this.gbxCondition.Controls.Add(this.c_Label1);
-            this.gbxCondition.Controls.Add(this.c_Label2);
-            this.gbxCondition.Controls.Add(this.lblAccountDateStart);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
-            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
-            this.gbxCondition.Controls.Add(this.btnClearCondition);
-            this.gbxCondition.Controls.Add(this.btnSearch);
-            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.gbxCondition.IsMustInput = false;
-            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
-            this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(812, 59);
-            this.gbxCondition.TabIndex = 37;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
-            // 
-            // c_Label1
-            // 
-            this.c_Label1.AutoSize = true;
-            this.c_Label1.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label1.Location = new System.Drawing.Point(178, 24);
-            this.c_Label1.Name = "c_Label1";
-            this.c_Label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.c_Label1.Size = new System.Drawing.Size(11, 12);
-            this.c_Label1.TabIndex = 7;
-            this.c_Label1.Text = "-";
-            // 
-            // dtpAccountDateEnd
-            // 
-            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
-            this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateEnd.Location = new System.Drawing.Point(195, 20);
-            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
-            this.dtpAccountDateEnd.Size = new System.Drawing.Size(100, 21);
-            this.dtpAccountDateEnd.TabIndex = 2;
-            // 
-            // dgvRpt
-            // 
-            this.dgvRpt.AllowUserToAddRows = false;
-            this.dgvRpt.AllowUserToDeleteRows = false;
-            this.dgvRpt.AllowUserToModifyRows = true;
-            this.dgvRpt.AllowUserToOrderColumns = true;
-            this.dgvRpt.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvRpt.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvRpt.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvRpt.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvRpt.CellHeight = 23;
-            this.dgvRpt.ChildNodeColumnName = null;
-            this.dgvRpt.ChildNodeColumnText = null;
-            this.dgvRpt.ColumnDeep = 1;
-            this.dgvRpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRpt.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvRpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvRpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.cmbGoodsType2);
+			this.gbxCondition.Controls.Add(this.c_Label1);
+			this.gbxCondition.Controls.Add(this.c_Label2);
+			this.gbxCondition.Controls.Add(this.lblAccountDateStart);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+			this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+			this.gbxCondition.Controls.Add(this.btnClearCondition);
+			this.gbxCondition.Controls.Add(this.btnSearch);
+			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.gbxCondition.IsMustInput = false;
+			this.gbxCondition.Location = new System.Drawing.Point(0, 48);
+			this.gbxCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Name = "gbxCondition";
+			this.gbxCondition.OriginalHeight = -1;
+			this.gbxCondition.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.gbxCondition.Size = new System.Drawing.Size(1083, 74);
+			this.gbxCondition.TabIndex = 37;
+			this.gbxCondition.TabStop = false;
+			this.gbxCondition.Text = "查询条件 ▼";
+			// 
+			// cmbGoodsType2
+			// 
+			this.cmbGoodsType2.FormattingEnabled = true;
+			this.cmbGoodsType2.Items.AddRange(new object[] {
+            "全部",
+            "大件",
+            "小件"});
+			this.cmbGoodsType2.Location = new System.Drawing.Point(533, 26);
+			this.cmbGoodsType2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.cmbGoodsType2.Name = "cmbGoodsType2";
+			this.cmbGoodsType2.Size = new System.Drawing.Size(159, 23);
+			this.cmbGoodsType2.TabIndex = 14;
+			// 
+			// c_Label1
+			// 
+			this.c_Label1.AutoSize = true;
+			this.c_Label1.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label1.Location = new System.Drawing.Point(256, 30);
+			this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.c_Label1.Name = "c_Label1";
+			this.c_Label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.c_Label1.Size = new System.Drawing.Size(15, 15);
+			this.c_Label1.TabIndex = 7;
+			this.c_Label1.Text = "-";
+			// 
+			// c_Label2
+			// 
+			this.c_Label2.AutoSize = true;
+			this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.c_Label2.Location = new System.Drawing.Point(456, 30);
+			this.c_Label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+			this.c_Label2.Name = "c_Label2";
+			this.c_Label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+			this.c_Label2.Size = new System.Drawing.Size(67, 15);
+			this.c_Label2.TabIndex = 7;
+			this.c_Label2.Text = "产品类型";
+			// 
+			// dtpAccountDateEnd
+			// 
+			this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpAccountDateEnd.Location = new System.Drawing.Point(280, 25);
+			this.dtpAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+			this.dtpAccountDateEnd.Size = new System.Drawing.Size(158, 25);
+			this.dtpAccountDateEnd.TabIndex = 2;
+			// 
+			// dgvRpt
+			// 
+			this.dgvRpt.AllowUserToAddRows = false;
+			this.dgvRpt.AllowUserToDeleteRows = false;
+			this.dgvRpt.AllowUserToModifyRows = true;
+			this.dgvRpt.AllowUserToOrderColumns = true;
+			this.dgvRpt.AllowUserToSortRows = false;
+			dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvRpt.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12;
+			this.dgvRpt.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvRpt.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvRpt.CellHeight = 23;
+			this.dgvRpt.ChildNodeColumnName = null;
+			this.dgvRpt.ChildNodeColumnText = null;
+			this.dgvRpt.ColumnDeep = 1;
+			this.dgvRpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle13.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvRpt.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
+			this.dgvRpt.ColumnHeadersHeight = 29;
+			this.dgvRpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvRpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.g1pcode,
             this.g1pname,
             this.g1gtcode2,
@@ -252,304 +289,313 @@
             this.Qualified,
             this.g1defectcount,
             this.g1ccp});
-            this.dgvRpt.ColumnTreeView = null;
-            this.dgvRpt.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.dgvRpt.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvRpt.DynamicColumnName = "";
-            this.dgvRpt.EnableHeadersVisualStyles = false;
-            this.dgvRpt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvRpt.FormatQuantityColumns = null;
-            this.dgvRpt.HorizontalMergeColumn = null;
-            this.dgvRpt.IsAutoCountSum = true;
-            this.dgvRpt.IsAutoResizeColumns = false;
-            this.dgvRpt.IsClickF12 = false;
-            this.dgvRpt.IsOpenMergeCellFlag = false;
-            this.dgvRpt.IsSubTotalFlag = false;
-            this.dgvRpt.IsTopDeep = false;
-            this.dgvRpt.Location = new System.Drawing.Point(0, 0);
-            this.dgvRpt.MergeColumnNames = null;
-            this.dgvRpt.MergeDetailColumnNames = null;
-            this.dgvRpt.MergeDetailOnlyColumn = null;
-            this.dgvRpt.MergeOnlyColumn = null;
-            this.dgvRpt.MultiSelect = false;
-            this.dgvRpt.Name = "dgvRpt";
-            this.dgvRpt.ReadOnly = true;
-            this.dgvRpt.RefreshAtHscroll = false;
-            this.dgvRpt.RowHeadersWidth = 50;
-            this.dgvRpt.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvRpt.RowsDefaultCellStyle = dataGridViewCellStyle7;
-            this.dgvRpt.RowTemplate.Height = 21;
-            this.dgvRpt.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRpt.Size = new System.Drawing.Size(500, 372);
-            this.dgvRpt.SortOrderColumnName = null;
-            this.dgvRpt.TabIndex = 28;
-            this.dgvRpt.Tag = true;
-            this.dgvRpt.TotalSumColumns = null;
-            this.dgvRpt.ViewRowFilter = "";
-            this.dgvRpt.SelectionChanged += new System.EventHandler(this.dgvRpt_SelectionChanged);
-            // 
-            // g1pcode
-            // 
-            this.g1pcode.DataPropertyName = "pcode";
-            this.g1pcode.HeaderText = "pcode";
-            this.g1pcode.Name = "g1pcode";
-            this.g1pcode.ReadOnly = true;
-            this.g1pcode.Visible = false;
-            // 
-            // g1pname
-            // 
-            this.g1pname.DataPropertyName = "pname";
-            this.g1pname.HeaderText = "工艺";
-            this.g1pname.Name = "g1pname";
-            this.g1pname.ReadOnly = true;
-            this.g1pname.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // g1gtcode2
-            // 
-            this.g1gtcode2.DataPropertyName = "gtcode2";
-            this.g1gtcode2.HeaderText = "gtcode2";
-            this.g1gtcode2.Name = "g1gtcode2";
-            this.g1gtcode2.ReadOnly = true;
-            this.g1gtcode2.Visible = false;
-            // 
-            // g1goodstypename
-            // 
-            this.g1goodstypename.DataPropertyName = "goodstypename";
-            this.g1goodstypename.HeaderText = "类别";
-            this.g1goodstypename.Name = "g1goodstypename";
-            this.g1goodstypename.ReadOnly = true;
-            this.g1goodstypename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // OutKilnCount
-            // 
-            this.OutKilnCount.DataPropertyName = "outkcount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.Format = "N0";
-            this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle3;
-            this.OutKilnCount.HeaderText = "出窑数";
-            this.OutKilnCount.Name = "OutKilnCount";
-            this.OutKilnCount.ReadOnly = true;
-            this.OutKilnCount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // Qualified
-            // 
-            this.Qualified.DataPropertyName = "cc";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Format = "N0";
-            this.Qualified.DefaultCellStyle = dataGridViewCellStyle4;
-            this.Qualified.HeaderText = "合格数";
-            this.Qualified.Name = "Qualified";
-            this.Qualified.ReadOnly = true;
-            this.Qualified.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // g1defectcount
-            // 
-            this.g1defectcount.DataPropertyName = "defectcount";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Format = "N0";
-            this.g1defectcount.DefaultCellStyle = dataGridViewCellStyle5;
-            this.g1defectcount.HeaderText = "次品数";
-            this.g1defectcount.Name = "g1defectcount";
-            this.g1defectcount.ReadOnly = true;
-            this.g1defectcount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // g1ccp
-            // 
-            this.g1ccp.DataPropertyName = "ccp";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Format = "P2";
-            dataGridViewCellStyle6.NullValue = "#DIV/0!";
-            this.g1ccp.DefaultCellStyle = dataGridViewCellStyle6;
-            this.g1ccp.HeaderText = "合格率";
-            this.g1ccp.Name = "g1ccp";
-            this.g1ccp.ReadOnly = true;
-            this.g1ccp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // splitContainer1
-            // 
-            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.dgvRpt.ColumnTreeView = null;
+			this.dgvRpt.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.dgvRpt.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgvRpt.DynamicColumnName = "";
+			this.dgvRpt.EnableHeadersVisualStyles = false;
+			this.dgvRpt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvRpt.FormatQuantityColumns = null;
+			this.dgvRpt.HorizontalMergeColumn = null;
+			this.dgvRpt.IsAutoCountSum = true;
+			this.dgvRpt.IsAutoResizeColumns = false;
+			this.dgvRpt.IsClickF12 = false;
+			this.dgvRpt.IsOpenMergeCellFlag = false;
+			this.dgvRpt.IsSubTotalFlag = false;
+			this.dgvRpt.IsTopDeep = false;
+			this.dgvRpt.Location = new System.Drawing.Point(0, 0);
+			this.dgvRpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvRpt.MergeColumnNames = null;
+			this.dgvRpt.MergeDetailColumnNames = null;
+			this.dgvRpt.MergeDetailOnlyColumn = null;
+			this.dgvRpt.MergeOnlyColumn = null;
+			this.dgvRpt.MultiSelect = false;
+			this.dgvRpt.Name = "dgvRpt";
+			this.dgvRpt.ReadOnly = true;
+			this.dgvRpt.RefreshAtHscroll = false;
+			this.dgvRpt.RowHeadersWidth = 50;
+			this.dgvRpt.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvRpt.RowsDefaultCellStyle = dataGridViewCellStyle18;
+			this.dgvRpt.RowTemplate.Height = 21;
+			this.dgvRpt.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvRpt.Size = new System.Drawing.Size(500, 465);
+			this.dgvRpt.SortOrderColumnName = null;
+			this.dgvRpt.TabIndex = 28;
+			this.dgvRpt.Tag = true;
+			this.dgvRpt.TotalSumColumns = null;
+			this.dgvRpt.ViewRowFilter = "";
+			this.dgvRpt.SelectionChanged += new System.EventHandler(this.dgvRpt_SelectionChanged);
+			// 
+			// g1pcode
+			// 
+			this.g1pcode.DataPropertyName = "pcode";
+			this.g1pcode.HeaderText = "pcode";
+			this.g1pcode.MinimumWidth = 6;
+			this.g1pcode.Name = "g1pcode";
+			this.g1pcode.ReadOnly = true;
+			this.g1pcode.Visible = false;
+			this.g1pcode.Width = 125;
+			// 
+			// g1pname
+			// 
+			this.g1pname.DataPropertyName = "pname";
+			this.g1pname.HeaderText = "工艺";
+			this.g1pname.MinimumWidth = 6;
+			this.g1pname.Name = "g1pname";
+			this.g1pname.ReadOnly = true;
+			this.g1pname.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g1pname.Width = 125;
+			// 
+			// g1gtcode2
+			// 
+			this.g1gtcode2.DataPropertyName = "gtcode2";
+			this.g1gtcode2.HeaderText = "gtcode2";
+			this.g1gtcode2.MinimumWidth = 6;
+			this.g1gtcode2.Name = "g1gtcode2";
+			this.g1gtcode2.ReadOnly = true;
+			this.g1gtcode2.Visible = false;
+			this.g1gtcode2.Width = 125;
+			// 
+			// g1goodstypename
+			// 
+			this.g1goodstypename.DataPropertyName = "goodstypename";
+			this.g1goodstypename.HeaderText = "类别";
+			this.g1goodstypename.MinimumWidth = 6;
+			this.g1goodstypename.Name = "g1goodstypename";
+			this.g1goodstypename.ReadOnly = true;
+			this.g1goodstypename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g1goodstypename.Width = 125;
+			// 
+			// OutKilnCount
+			// 
+			this.OutKilnCount.DataPropertyName = "outkcount";
+			dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle14.Format = "N0";
+			this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle14;
+			this.OutKilnCount.HeaderText = "出窑数";
+			this.OutKilnCount.MinimumWidth = 6;
+			this.OutKilnCount.Name = "OutKilnCount";
+			this.OutKilnCount.ReadOnly = true;
+			this.OutKilnCount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.OutKilnCount.Width = 125;
+			// 
+			// Qualified
+			// 
+			this.Qualified.DataPropertyName = "cc";
+			dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle15.Format = "N0";
+			this.Qualified.DefaultCellStyle = dataGridViewCellStyle15;
+			this.Qualified.HeaderText = "合格数";
+			this.Qualified.MinimumWidth = 6;
+			this.Qualified.Name = "Qualified";
+			this.Qualified.ReadOnly = true;
+			this.Qualified.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.Qualified.Width = 125;
+			// 
+			// g1defectcount
+			// 
+			this.g1defectcount.DataPropertyName = "defectcount";
+			dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle16.Format = "N0";
+			this.g1defectcount.DefaultCellStyle = dataGridViewCellStyle16;
+			this.g1defectcount.HeaderText = "次品数";
+			this.g1defectcount.MinimumWidth = 6;
+			this.g1defectcount.Name = "g1defectcount";
+			this.g1defectcount.ReadOnly = true;
+			this.g1defectcount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g1defectcount.Width = 125;
+			// 
+			// g1ccp
+			// 
+			this.g1ccp.DataPropertyName = "ccp";
+			dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle17.Format = "P2";
+			dataGridViewCellStyle17.NullValue = "#DIV/0!";
+			this.g1ccp.DefaultCellStyle = dataGridViewCellStyle17;
+			this.g1ccp.HeaderText = "合格率";
+			this.g1ccp.MinimumWidth = 6;
+			this.g1ccp.Name = "g1ccp";
+			this.g1ccp.ReadOnly = true;
+			this.g1ccp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g1ccp.Width = 125;
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 103);
-            this.splitContainer1.Name = "splitContainer1";
-            // 
-            // splitContainer1.Panel1
-            // 
-            this.splitContainer1.Panel1.Controls.Add(this.dgvRpt);
-            // 
-            // splitContainer1.Panel2
-            // 
-            this.splitContainer1.Panel2.Controls.Add(this.dgvD);
-            this.splitContainer1.Size = new System.Drawing.Size(812, 372);
-            this.splitContainer1.SplitterDistance = 500;
-            this.splitContainer1.TabIndex = 38;
-            // 
-            // dgvD
-            // 
-            this.dgvD.AllowUserToAddRows = false;
-            this.dgvD.AllowUserToDeleteRows = false;
-            this.dgvD.AllowUserToModifyRows = true;
-            this.dgvD.AllowUserToOrderColumns = true;
-            this.dgvD.AllowUserToSortRows = false;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
-            this.dgvD.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvD.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvD.CellHeight = 23;
-            this.dgvD.ChildNodeColumnName = null;
-            this.dgvD.ChildNodeColumnText = null;
-            this.dgvD.ColumnDeep = 1;
-            this.dgvD.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
-            this.dgvD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 129);
+			this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.dgvRpt);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.dgvD);
+			this.splitContainer1.Size = new System.Drawing.Size(1083, 465);
+			this.splitContainer1.SplitterDistance = 500;
+			this.splitContainer1.SplitterWidth = 5;
+			this.splitContainer1.TabIndex = 38;
+			// 
+			// dgvD
+			// 
+			this.dgvD.AllowUserToAddRows = false;
+			this.dgvD.AllowUserToDeleteRows = false;
+			this.dgvD.AllowUserToModifyRows = true;
+			this.dgvD.AllowUserToOrderColumns = true;
+			this.dgvD.AllowUserToSortRows = false;
+			dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
+			this.dgvD.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvD.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvD.CellHeight = 23;
+			this.dgvD.ChildNodeColumnName = null;
+			this.dgvD.ChildNodeColumnText = null;
+			this.dgvD.ColumnDeep = 1;
+			this.dgvD.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle20.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
+			this.dgvD.ColumnHeadersHeight = 29;
+			this.dgvD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.g2pcode,
             this.g2pname,
             this.g2gt2,
             this.defectcode,
             this.defectname,
             this.defectcount});
-            this.dgvD.ColumnTreeView = null;
-            this.dgvD.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.dgvD.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvD.DynamicColumnName = "";
-            this.dgvD.EnableHeadersVisualStyles = false;
-            this.dgvD.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvD.FormatQuantityColumns = null;
-            this.dgvD.HorizontalMergeColumn = null;
-            this.dgvD.IsAutoCountSum = true;
-            this.dgvD.IsAutoResizeColumns = false;
-            this.dgvD.IsClickF12 = false;
-            this.dgvD.IsOpenMergeCellFlag = false;
-            this.dgvD.IsSubTotalFlag = false;
-            this.dgvD.IsTopDeep = false;
-            this.dgvD.Location = new System.Drawing.Point(0, 0);
-            this.dgvD.MergeColumnNames = null;
-            this.dgvD.MergeDetailColumnNames = null;
-            this.dgvD.MergeDetailOnlyColumn = null;
-            this.dgvD.MergeOnlyColumn = null;
-            this.dgvD.MultiSelect = false;
-            this.dgvD.Name = "dgvD";
-            this.dgvD.ReadOnly = true;
-            this.dgvD.RefreshAtHscroll = false;
-            this.dgvD.RowHeadersWidth = 50;
-            this.dgvD.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvD.RowsDefaultCellStyle = dataGridViewCellStyle11;
-            this.dgvD.RowTemplate.Height = 21;
-            this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvD.Size = new System.Drawing.Size(308, 372);
-            this.dgvD.SortOrderColumnName = null;
-            this.dgvD.TabIndex = 29;
-            this.dgvD.Tag = true;
-            this.dgvD.TotalSumColumns = null;
-            this.dgvD.ViewRowFilter = "";
-            // 
-            // g2pcode
-            // 
-            this.g2pcode.DataPropertyName = "pcode";
-            this.g2pcode.HeaderText = "pcode";
-            this.g2pcode.Name = "g2pcode";
-            this.g2pcode.ReadOnly = true;
-            this.g2pcode.Visible = false;
-            // 
-            // g2pname
-            // 
-            this.g2pname.DataPropertyName = "pname";
-            this.g2pname.HeaderText = "工艺";
-            this.g2pname.Name = "g2pname";
-            this.g2pname.ReadOnly = true;
-            this.g2pname.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // g2gt2
-            // 
-            this.g2gt2.DataPropertyName = "gtname2";
-            this.g2gt2.HeaderText = "类别";
-            this.g2gt2.Name = "g2gt2";
-            this.g2gt2.ReadOnly = true;
-            this.g2gt2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // defectcode
-            // 
-            this.defectcode.DataPropertyName = "defectcode";
-            this.defectcode.HeaderText = "缺陷码";
-            this.defectcode.Name = "defectcode";
-            this.defectcode.ReadOnly = true;
-            // 
-            // defectname
-            // 
-            this.defectname.DataPropertyName = "defectname";
-            this.defectname.HeaderText = "缺陷名";
-            this.defectname.Name = "defectname";
-            this.defectname.ReadOnly = true;
-            // 
-            // defectcount
-            // 
-            this.defectcount.DataPropertyName = "defectcount";
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.Format = "N0";
-            this.defectcount.DefaultCellStyle = dataGridViewCellStyle10;
-            this.defectcount.HeaderText = "缺陷数";
-            this.defectcount.Name = "defectcount";
-            this.defectcount.ReadOnly = true;
-            // 
-            // cmbGoodsType2
-            // 
-            this.cmbGoodsType2.FormattingEnabled = true;
-            this.cmbGoodsType2.Items.AddRange(new object[] {
-            "全部",
-            "大件",
-            "小件"});
-            this.cmbGoodsType2.Location = new System.Drawing.Point(360, 21);
-            this.cmbGoodsType2.Name = "cmbGoodsType2";
-            this.cmbGoodsType2.Size = new System.Drawing.Size(120, 20);
-            this.cmbGoodsType2.TabIndex = 14;
-            // 
-            // c_Label2
-            // 
-            this.c_Label2.AutoSize = true;
-            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label2.Location = new System.Drawing.Point(301, 24);
-            this.c_Label2.Name = "c_Label2";
-            this.c_Label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.c_Label2.Size = new System.Drawing.Size(53, 12);
-            this.c_Label2.TabIndex = 7;
-            this.c_Label2.Text = "产品类型";
-            // 
-            // F_RPT_040113
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(824, 476);
-            this.Controls.Add(this.splitContainer1);
-            this.Controls.Add(this.tsrOperate);
-            this.Controls.Add(this.gbxCondition);
-            this.Name = "F_RPT_040113";
-            this.Text = "各工艺质量表";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040113_FormClosed);
-            this.Load += new System.EventHandler(this.F_RPT_040113_Load);
-            this.tsrOperate.ResumeLayout(false);
-            this.tsrOperate.PerformLayout();
-            this.gbxCondition.ResumeLayout(false);
-            this.gbxCondition.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).EndInit();
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).EndInit();
-            this.ResumeLayout(false);
+			this.dgvD.ColumnTreeView = null;
+			this.dgvD.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.dgvD.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgvD.DynamicColumnName = "";
+			this.dgvD.EnableHeadersVisualStyles = false;
+			this.dgvD.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvD.FormatQuantityColumns = null;
+			this.dgvD.HorizontalMergeColumn = null;
+			this.dgvD.IsAutoCountSum = true;
+			this.dgvD.IsAutoResizeColumns = false;
+			this.dgvD.IsClickF12 = false;
+			this.dgvD.IsOpenMergeCellFlag = false;
+			this.dgvD.IsSubTotalFlag = false;
+			this.dgvD.IsTopDeep = false;
+			this.dgvD.Location = new System.Drawing.Point(0, 0);
+			this.dgvD.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.dgvD.MergeColumnNames = null;
+			this.dgvD.MergeDetailColumnNames = null;
+			this.dgvD.MergeDetailOnlyColumn = null;
+			this.dgvD.MergeOnlyColumn = null;
+			this.dgvD.MultiSelect = false;
+			this.dgvD.Name = "dgvD";
+			this.dgvD.ReadOnly = true;
+			this.dgvD.RefreshAtHscroll = false;
+			this.dgvD.RowHeadersWidth = 50;
+			this.dgvD.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvD.RowsDefaultCellStyle = dataGridViewCellStyle22;
+			this.dgvD.RowTemplate.Height = 21;
+			this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvD.Size = new System.Drawing.Size(578, 465);
+			this.dgvD.SortOrderColumnName = null;
+			this.dgvD.TabIndex = 29;
+			this.dgvD.Tag = true;
+			this.dgvD.TotalSumColumns = null;
+			this.dgvD.ViewRowFilter = "";
+			// 
+			// g2pcode
+			// 
+			this.g2pcode.DataPropertyName = "pcode";
+			this.g2pcode.HeaderText = "pcode";
+			this.g2pcode.MinimumWidth = 6;
+			this.g2pcode.Name = "g2pcode";
+			this.g2pcode.ReadOnly = true;
+			this.g2pcode.Visible = false;
+			this.g2pcode.Width = 125;
+			// 
+			// g2pname
+			// 
+			this.g2pname.DataPropertyName = "pname";
+			this.g2pname.HeaderText = "工艺";
+			this.g2pname.MinimumWidth = 6;
+			this.g2pname.Name = "g2pname";
+			this.g2pname.ReadOnly = true;
+			this.g2pname.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g2pname.Width = 125;
+			// 
+			// g2gt2
+			// 
+			this.g2gt2.DataPropertyName = "gtname2";
+			this.g2gt2.HeaderText = "类别";
+			this.g2gt2.MinimumWidth = 6;
+			this.g2gt2.Name = "g2gt2";
+			this.g2gt2.ReadOnly = true;
+			this.g2gt2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+			this.g2gt2.Width = 125;
+			// 
+			// defectcode
+			// 
+			this.defectcode.DataPropertyName = "defectcode";
+			this.defectcode.HeaderText = "缺陷码";
+			this.defectcode.MinimumWidth = 6;
+			this.defectcode.Name = "defectcode";
+			this.defectcode.ReadOnly = true;
+			this.defectcode.Width = 125;
+			// 
+			// defectname
+			// 
+			this.defectname.DataPropertyName = "defectname";
+			this.defectname.HeaderText = "缺陷名";
+			this.defectname.MinimumWidth = 6;
+			this.defectname.Name = "defectname";
+			this.defectname.ReadOnly = true;
+			this.defectname.Width = 125;
+			// 
+			// defectcount
+			// 
+			this.defectcount.DataPropertyName = "defectcount";
+			dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle21.Format = "N0";
+			this.defectcount.DefaultCellStyle = dataGridViewCellStyle21;
+			this.defectcount.HeaderText = "缺陷数";
+			this.defectcount.MinimumWidth = 6;
+			this.defectcount.Name = "defectcount";
+			this.defectcount.ReadOnly = true;
+			this.defectcount.Width = 125;
+			// 
+			// F_RPT_040113
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1099, 595);
+			this.Controls.Add(this.splitContainer1);
+			this.Controls.Add(this.tsrOperate);
+			this.Controls.Add(this.gbxCondition);
+			this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+			this.Name = "F_RPT_040113";
+			this.Text = "各工艺质量表";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040113_FormClosed);
+			this.Load += new System.EventHandler(this.F_RPT_040113_Load);
+			this.tsrOperate.ResumeLayout(false);
+			this.tsrOperate.PerformLayout();
+			this.gbxCondition.ResumeLayout(false);
+			this.gbxCondition.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).EndInit();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dgvD)).EndInit();
+			this.ResumeLayout(false);
 
         }
 

+ 1 - 1
DK.Client/ReportModule/R04/M01/F_RPT_040113.cs

@@ -153,7 +153,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 _cre.Name = "R040113";
 
                 _cre.Properties["timebegin"] = this.dtpAccountDateStart.Value.Date;
-                _cre.Properties["timeend"] = this.dtpAccountDateEnd.Value.Date.AddDays(1);
+                _cre.Properties["timeend"] = this.dtpAccountDateEnd.Value.Date;
                 if (this.cmbGoodsType2.Text == "大件")
                 {
                     _cre.Properties["gtcode2"] = "001001";