产成品明细表增加产品类别

DK.Client/ReportModule/R01/M04/F_RPT_010402.cs

@@ -220,6 +220,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				//se.AccountDateEnd = DateTime.Parse(this.dtpAccountDateEnd.Value.ToString("yyyy-MM-dd") + " 23:59:59");
 				se.AccountDateStart = this.dtpAccountDateStart.Value;
 				se.AccountDateEnd = this.dtpAccountDateEnd.Value;
+				se.GoodsTypeCode = this.scbGoodsType.SearchedValue + "";
 				if (this.chkCreateTime.Checked)
 				{
 					se.CreateTimeStart = DateTime.Parse(this.dtpCreateTimeStart.Value.ToString("yyyy-MM-dd") + " 0:0:0");

DK.Client/ReportModule/R08/F_RPT_080116.Designer.cs

@@ -28,493 +28,472 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_080116));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            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.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
-            this.typeInspection = new System.Windows.Forms.GroupBox();
-            this.radioButton3 = new System.Windows.Forms.RadioButton();
-            this.radioButton4 = new System.Windows.Forms.RadioButton();
-            this.Historical = new System.Windows.Forms.GroupBox();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.cbInpectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
-            this.lblInspectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpCreateTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.lblCreateTimeTo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.dtpCreateTimeBegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-            this.lblCreateTime = 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.dgvBarcodeIdnrk = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.INSPECTITEM = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.COUNTS = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ISQUALIFIED = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.BUHEGELV = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ZHANBI = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.dgvQCdata = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-            this.BARCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.INSPECTITEMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.INSPECTVALUE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.USERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.USERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tsrOperate.SuspendLayout();
-            this.gbxCondition.SuspendLayout();
-            this.typeInspection.SuspendLayout();
-            this.Historical.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvBarcodeIdnrk)).BeginInit();
-            this.tabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            this.tabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvQCdata)).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(24, 24);
-            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_080116));
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			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.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.typeInspection = new System.Windows.Forms.GroupBox();
+			this.radioButton3 = new System.Windows.Forms.RadioButton();
+			this.radioButton4 = new System.Windows.Forms.RadioButton();
+			this.Historical = new System.Windows.Forms.GroupBox();
+			this.radioButton2 = new System.Windows.Forms.RadioButton();
+			this.radioButton1 = new System.Windows.Forms.RadioButton();
+			this.cbInpectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+			this.lblInspectName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dtpCreateTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.lblCreateTimeTo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.dtpCreateTimeBegin = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+			this.lblCreateTime = 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.dgvBarcodeIdnrk = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.INSPECTITEM = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.COUNTS = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ISQUALIFIED = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BUHEGELV = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ZHANBI = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.dgvQCdata = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.BARCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.INSPECTITEMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.INSPECTVALUE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.USERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.USERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate.SuspendLayout();
+			this.gbxCondition.SuspendLayout();
+			this.typeInspection.SuspendLayout();
+			this.Historical.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvBarcodeIdnrk)).BeginInit();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvQCdata)).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(24, 24);
+			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.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(1970, 52);
-            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);
-            // 
-            // 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.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0);
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1283, 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);
+			// 
+			// 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.typeInspection);
-            this.gbxCondition.Controls.Add(this.Historical);
-            this.gbxCondition.Controls.Add(this.cbInpectName);
-            this.gbxCondition.Controls.Add(this.lblInspectName);
-            this.gbxCondition.Controls.Add(this.dtpCreateTimeEnd);
-            this.gbxCondition.Controls.Add(this.lblCreateTimeTo);
-            this.gbxCondition.Controls.Add(this.dtpCreateTimeBegin);
-            this.gbxCondition.Controls.Add(this.lblCreateTime);
-            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, 57);
-            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(1960, 76);
-            this.gbxCondition.TabIndex = 1;
-            this.gbxCondition.TabStop = false;
-            this.gbxCondition.Text = "查询条件 ▼";
-            // 
-            // typeInspection
-            // 
-            this.typeInspection.Controls.Add(this.radioButton3);
-            this.typeInspection.Controls.Add(this.radioButton4);
-            this.typeInspection.Location = new System.Drawing.Point(730, 16);
-            this.typeInspection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.typeInspection.Name = "typeInspection";
-            this.typeInspection.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.typeInspection.Size = new System.Drawing.Size(206, 56);
-            this.typeInspection.TabIndex = 48;
-            this.typeInspection.TabStop = false;
-            this.typeInspection.Text = "显示型式检验";
-            // 
-            // radioButton3
-            // 
-            this.radioButton3.AutoSize = true;
-            this.radioButton3.Location = new System.Drawing.Point(26, 24);
-            this.radioButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.radioButton3.Name = "radioButton3";
-            this.radioButton3.Size = new System.Drawing.Size(51, 22);
-            this.radioButton3.TabIndex = 45;
-            this.radioButton3.Tag = "";
-            this.radioButton3.Text = "是";
-            this.radioButton3.UseVisualStyleBackColor = true;
-            this.radioButton3.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButton4
-            // 
-            this.radioButton4.AutoSize = true;
-            this.radioButton4.Checked = true;
-            this.radioButton4.Location = new System.Drawing.Point(144, 24);
-            this.radioButton4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.radioButton4.Name = "radioButton4";
-            this.radioButton4.Size = new System.Drawing.Size(51, 22);
-            this.radioButton4.TabIndex = 44;
-            this.radioButton4.TabStop = true;
-            this.radioButton4.Text = "否";
-            this.radioButton4.UseVisualStyleBackColor = true;
-            this.radioButton4.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // Historical
-            // 
-            this.Historical.Controls.Add(this.radioButton2);
-            this.Historical.Controls.Add(this.radioButton1);
-            this.Historical.Location = new System.Drawing.Point(502, 16);
-            this.Historical.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Historical.Name = "Historical";
-            this.Historical.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Historical.Size = new System.Drawing.Size(206, 56);
-            this.Historical.TabIndex = 47;
-            this.Historical.TabStop = false;
-            this.Historical.Text = "显示历史版本";
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Checked = true;
-            this.radioButton2.Location = new System.Drawing.Point(144, 24);
-            this.radioButton2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(51, 22);
-            this.radioButton2.TabIndex = 45;
-            this.radioButton2.TabStop = true;
-            this.radioButton2.Tag = "";
-            this.radioButton2.Text = "否";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            this.radioButton2.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Location = new System.Drawing.Point(24, 24);
-            this.radioButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(51, 22);
-            this.radioButton1.TabIndex = 44;
-            this.radioButton1.Text = "是";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            this.radioButton1.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // cbInpectName
-            // 
-            this.cbInpectName.BackColor = System.Drawing.SystemColors.Window;
-            this.cbInpectName.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.cbInpectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbInpectName.FormattingEnabled = true;
-            this.cbInpectName.Location = new System.Drawing.Point(134, 26);
-            this.cbInpectName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.cbInpectName.Name = "cbInpectName";
-            this.cbInpectName.Size = new System.Drawing.Size(358, 26);
-            this.cbInpectName.TabIndex = 37;
-            this.cbInpectName.TextUpdate += new System.EventHandler(this.cbInpectNameText_Updata);
-            // 
-            // lblInspectName
-            // 
-            this.lblInspectName.AutoSize = true;
-            this.lblInspectName.BackColor = System.Drawing.Color.Transparent;
-            this.lblInspectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblInspectName.Location = new System.Drawing.Point(9, 32);
-            this.lblInspectName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblInspectName.Name = "lblInspectName";
-            this.lblInspectName.Size = new System.Drawing.Size(116, 18);
-            this.lblInspectName.TabIndex = 36;
-            this.lblInspectName.Text = "检验标准名称";
-            // 
-            // dtpCreateTimeEnd
-            // 
-            this.dtpCreateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-            this.dtpCreateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpCreateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpCreateTimeEnd.Location = new System.Drawing.Point(1305, 26);
-            this.dtpCreateTimeEnd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.dtpCreateTimeEnd.Name = "dtpCreateTimeEnd";
-            this.dtpCreateTimeEnd.Size = new System.Drawing.Size(224, 28);
-            this.dtpCreateTimeEnd.TabIndex = 35;
-            // 
-            // lblCreateTimeTo
-            // 
-            this.lblCreateTimeTo.AutoSize = true;
-            this.lblCreateTimeTo.BackColor = System.Drawing.Color.Transparent;
-            this.lblCreateTimeTo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblCreateTimeTo.Location = new System.Drawing.Point(1270, 34);
-            this.lblCreateTimeTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblCreateTimeTo.Name = "lblCreateTimeTo";
-            this.lblCreateTimeTo.Size = new System.Drawing.Size(26, 18);
-            this.lblCreateTimeTo.TabIndex = 34;
-            this.lblCreateTimeTo.Text = "至";
-            // 
-            // dtpCreateTimeBegin
-            // 
-            this.dtpCreateTimeBegin.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-            this.dtpCreateTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpCreateTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpCreateTimeBegin.Location = new System.Drawing.Point(1034, 30);
-            this.dtpCreateTimeBegin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.dtpCreateTimeBegin.Name = "dtpCreateTimeBegin";
-            this.dtpCreateTimeBegin.Size = new System.Drawing.Size(226, 28);
-            this.dtpCreateTimeBegin.TabIndex = 33;
-            // 
-            // lblCreateTime
-            // 
-            this.lblCreateTime.AutoSize = true;
-            this.lblCreateTime.BackColor = System.Drawing.Color.Transparent;
-            this.lblCreateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblCreateTime.Location = new System.Drawing.Point(945, 34);
-            this.lblCreateTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblCreateTime.Name = "lblCreateTime";
-            this.lblCreateTime.Size = new System.Drawing.Size(80, 18);
-            this.lblCreateTime.TabIndex = 32;
-            this.lblCreateTime.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(1824, 16);
-            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnClearCondition.Name = "btnClearCondition";
-            this.btnClearCondition.Size = new System.Drawing.Size(128, 45);
-            this.btnClearCondition.TabIndex = 29;
-            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(1688, 16);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(128, 45);
-            this.btnSearch.TabIndex = 28;
-            this.btnSearch.Text = "查询(&Q)";
-            this.btnSearch.UseVisualStyleBackColor = true;
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
-            // 
-            // dgvBarcodeIdnrk
-            // 
-            this.dgvBarcodeIdnrk.AllowUserToAddRows = false;
-            this.dgvBarcodeIdnrk.AllowUserToDeleteRows = false;
-            this.dgvBarcodeIdnrk.AllowUserToModifyRows = true;
-            this.dgvBarcodeIdnrk.AllowUserToOrderColumns = true;
-            this.dgvBarcodeIdnrk.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvBarcodeIdnrk.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvBarcodeIdnrk.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.typeInspection);
+			this.gbxCondition.Controls.Add(this.Historical);
+			this.gbxCondition.Controls.Add(this.cbInpectName);
+			this.gbxCondition.Controls.Add(this.lblInspectName);
+			this.gbxCondition.Controls.Add(this.dtpCreateTimeEnd);
+			this.gbxCondition.Controls.Add(this.lblCreateTimeTo);
+			this.gbxCondition.Controls.Add(this.dtpCreateTimeBegin);
+			this.gbxCondition.Controls.Add(this.lblCreateTime);
+			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(1283, 51);
+			this.gbxCondition.TabIndex = 1;
+			this.gbxCondition.TabStop = false;
+			this.gbxCondition.Text = "查询条件 ▼";
+			// 
+			// typeInspection
+			// 
+			this.typeInspection.Controls.Add(this.radioButton3);
+			this.typeInspection.Controls.Add(this.radioButton4);
+			this.typeInspection.Location = new System.Drawing.Point(487, 11);
+			this.typeInspection.Name = "typeInspection";
+			this.typeInspection.Size = new System.Drawing.Size(137, 37);
+			this.typeInspection.TabIndex = 48;
+			this.typeInspection.TabStop = false;
+			this.typeInspection.Text = "显示型式检验";
+			// 
+			// radioButton3
+			// 
+			this.radioButton3.AutoSize = true;
+			this.radioButton3.Location = new System.Drawing.Point(17, 16);
+			this.radioButton3.Name = "radioButton3";
+			this.radioButton3.Size = new System.Drawing.Size(35, 16);
+			this.radioButton3.TabIndex = 45;
+			this.radioButton3.Tag = "";
+			this.radioButton3.Text = "是";
+			this.radioButton3.UseVisualStyleBackColor = true;
+			this.radioButton3.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+			// 
+			// radioButton4
+			// 
+			this.radioButton4.AutoSize = true;
+			this.radioButton4.Checked = true;
+			this.radioButton4.Location = new System.Drawing.Point(96, 16);
+			this.radioButton4.Name = "radioButton4";
+			this.radioButton4.Size = new System.Drawing.Size(35, 16);
+			this.radioButton4.TabIndex = 44;
+			this.radioButton4.TabStop = true;
+			this.radioButton4.Text = "否";
+			this.radioButton4.UseVisualStyleBackColor = true;
+			this.radioButton4.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+			// 
+			// Historical
+			// 
+			this.Historical.Controls.Add(this.radioButton2);
+			this.Historical.Controls.Add(this.radioButton1);
+			this.Historical.Location = new System.Drawing.Point(335, 11);
+			this.Historical.Name = "Historical";
+			this.Historical.Size = new System.Drawing.Size(137, 37);
+			this.Historical.TabIndex = 47;
+			this.Historical.TabStop = false;
+			this.Historical.Text = "显示历史版本";
+			// 
+			// radioButton2
+			// 
+			this.radioButton2.AutoSize = true;
+			this.radioButton2.Checked = true;
+			this.radioButton2.Location = new System.Drawing.Point(96, 16);
+			this.radioButton2.Name = "radioButton2";
+			this.radioButton2.Size = new System.Drawing.Size(35, 16);
+			this.radioButton2.TabIndex = 45;
+			this.radioButton2.TabStop = true;
+			this.radioButton2.Tag = "";
+			this.radioButton2.Text = "否";
+			this.radioButton2.UseVisualStyleBackColor = true;
+			this.radioButton2.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+			// 
+			// radioButton1
+			// 
+			this.radioButton1.AutoSize = true;
+			this.radioButton1.Location = new System.Drawing.Point(16, 16);
+			this.radioButton1.Name = "radioButton1";
+			this.radioButton1.Size = new System.Drawing.Size(35, 16);
+			this.radioButton1.TabIndex = 44;
+			this.radioButton1.Text = "是";
+			this.radioButton1.UseVisualStyleBackColor = true;
+			this.radioButton1.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+			// 
+			// cbInpectName
+			// 
+			this.cbInpectName.BackColor = System.Drawing.SystemColors.Window;
+			this.cbInpectName.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.cbInpectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.cbInpectName.FormattingEnabled = true;
+			this.cbInpectName.Location = new System.Drawing.Point(89, 17);
+			this.cbInpectName.Name = "cbInpectName";
+			this.cbInpectName.Size = new System.Drawing.Size(240, 20);
+			this.cbInpectName.TabIndex = 37;
+			this.cbInpectName.TextUpdate += new System.EventHandler(this.cbInpectNameText_Updata);
+			// 
+			// lblInspectName
+			// 
+			this.lblInspectName.AutoSize = true;
+			this.lblInspectName.BackColor = System.Drawing.Color.Transparent;
+			this.lblInspectName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblInspectName.Location = new System.Drawing.Point(6, 21);
+			this.lblInspectName.Name = "lblInspectName";
+			this.lblInspectName.Size = new System.Drawing.Size(77, 12);
+			this.lblInspectName.TabIndex = 36;
+			this.lblInspectName.Text = "检验标准名称";
+			// 
+			// dtpCreateTimeEnd
+			// 
+			this.dtpCreateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpCreateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpCreateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpCreateTimeEnd.Location = new System.Drawing.Point(870, 17);
+			this.dtpCreateTimeEnd.Name = "dtpCreateTimeEnd";
+			this.dtpCreateTimeEnd.Size = new System.Drawing.Size(151, 21);
+			this.dtpCreateTimeEnd.TabIndex = 35;
+			// 
+			// lblCreateTimeTo
+			// 
+			this.lblCreateTimeTo.AutoSize = true;
+			this.lblCreateTimeTo.BackColor = System.Drawing.Color.Transparent;
+			this.lblCreateTimeTo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblCreateTimeTo.Location = new System.Drawing.Point(847, 23);
+			this.lblCreateTimeTo.Name = "lblCreateTimeTo";
+			this.lblCreateTimeTo.Size = new System.Drawing.Size(17, 12);
+			this.lblCreateTimeTo.TabIndex = 34;
+			this.lblCreateTimeTo.Text = "至";
+			// 
+			// dtpCreateTimeBegin
+			// 
+			this.dtpCreateTimeBegin.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+			this.dtpCreateTimeBegin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dtpCreateTimeBegin.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+			this.dtpCreateTimeBegin.Location = new System.Drawing.Point(689, 20);
+			this.dtpCreateTimeBegin.Name = "dtpCreateTimeBegin";
+			this.dtpCreateTimeBegin.Size = new System.Drawing.Size(152, 21);
+			this.dtpCreateTimeBegin.TabIndex = 33;
+			// 
+			// lblCreateTime
+			// 
+			this.lblCreateTime.AutoSize = true;
+			this.lblCreateTime.BackColor = System.Drawing.Color.Transparent;
+			this.lblCreateTime.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblCreateTime.Location = new System.Drawing.Point(630, 23);
+			this.lblCreateTime.Name = "lblCreateTime";
+			this.lblCreateTime.Size = new System.Drawing.Size(53, 12);
+			this.lblCreateTime.TabIndex = 32;
+			this.lblCreateTime.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(1192, 11);
+			this.btnClearCondition.Name = "btnClearCondition";
+			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+			this.btnClearCondition.TabIndex = 29;
+			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(1101, 11);
+			this.btnSearch.Name = "btnSearch";
+			this.btnSearch.Size = new System.Drawing.Size(85, 30);
+			this.btnSearch.TabIndex = 28;
+			this.btnSearch.Text = "查询(&Q)";
+			this.btnSearch.UseVisualStyleBackColor = true;
+			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+			// 
+			// dgvBarcodeIdnrk
+			// 
+			this.dgvBarcodeIdnrk.AllowUserToAddRows = false;
+			this.dgvBarcodeIdnrk.AllowUserToDeleteRows = false;
+			this.dgvBarcodeIdnrk.AllowUserToModifyRows = true;
+			this.dgvBarcodeIdnrk.AllowUserToOrderColumns = true;
+			this.dgvBarcodeIdnrk.AllowUserToSortRows = false;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvBarcodeIdnrk.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.dgvBarcodeIdnrk.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.dgvBarcodeIdnrk.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvBarcodeIdnrk.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvBarcodeIdnrk.CellHeight = 23;
-            this.dgvBarcodeIdnrk.ChildNodeColumnName = null;
-            this.dgvBarcodeIdnrk.ChildNodeColumnText = null;
-            this.dgvBarcodeIdnrk.ColumnDeep = 1;
-            this.dgvBarcodeIdnrk.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.dgvBarcodeIdnrk.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvBarcodeIdnrk.ColumnHeadersHeight = 34;
-            this.dgvBarcodeIdnrk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvBarcodeIdnrk.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.dgvBarcodeIdnrk.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvBarcodeIdnrk.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvBarcodeIdnrk.CellHeight = 23;
+			this.dgvBarcodeIdnrk.ChildNodeColumnName = null;
+			this.dgvBarcodeIdnrk.ChildNodeColumnText = null;
+			this.dgvBarcodeIdnrk.ColumnDeep = 1;
+			this.dgvBarcodeIdnrk.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.dgvBarcodeIdnrk.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+			this.dgvBarcodeIdnrk.ColumnHeadersHeight = 34;
+			this.dgvBarcodeIdnrk.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvBarcodeIdnrk.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.INSPECTITEM,
             this.COUNTS,
             this.ISQUALIFIED,
             this.BUHEGELV,
             this.ZHANBI});
-            this.dgvBarcodeIdnrk.ColumnTreeView = null;
-            this.dgvBarcodeIdnrk.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.dgvBarcodeIdnrk.DynamicColumnName = "";
-            this.dgvBarcodeIdnrk.EnableHeadersVisualStyles = false;
-            this.dgvBarcodeIdnrk.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvBarcodeIdnrk.FormatQuantityColumns = null;
-            this.dgvBarcodeIdnrk.HasNode = false;
-            this.dgvBarcodeIdnrk.HorizontalMergeColumn = null;
-            this.dgvBarcodeIdnrk.IsAutoCountSum = true;
-            this.dgvBarcodeIdnrk.IsAutoResizeColumns = false;
-            this.dgvBarcodeIdnrk.IsClickF12 = false;
-            this.dgvBarcodeIdnrk.IsOpenMergeCellFlag = false;
-            this.dgvBarcodeIdnrk.IsSubTotalFlag = false;
-            this.dgvBarcodeIdnrk.IsTopDeep = false;
-            this.dgvBarcodeIdnrk.Location = new System.Drawing.Point(0, 0);
-            this.dgvBarcodeIdnrk.Margin = new System.Windows.Forms.Padding(0);
-            this.dgvBarcodeIdnrk.MergeColumnNames = null;
-            this.dgvBarcodeIdnrk.MergeDetailColumnNames = null;
-            this.dgvBarcodeIdnrk.MergeDetailOnlyColumn = null;
-            this.dgvBarcodeIdnrk.MergeOnlyColumn = null;
-            this.dgvBarcodeIdnrk.MultiSelect = false;
-            this.dgvBarcodeIdnrk.Name = "dgvBarcodeIdnrk";
-            this.dgvBarcodeIdnrk.ReadOnly = true;
-            this.dgvBarcodeIdnrk.RefreshAtHscroll = false;
-            this.dgvBarcodeIdnrk.RowHeadersWidth = 50;
-            this.dgvBarcodeIdnrk.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvBarcodeIdnrk.RowsDefaultCellStyle = dataGridViewCellStyle3;
-            this.dgvBarcodeIdnrk.RowTemplate.Height = 21;
-            this.dgvBarcodeIdnrk.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvBarcodeIdnrk.Size = new System.Drawing.Size(1952, 670);
-            this.dgvBarcodeIdnrk.SortOrderColumnName = null;
-            this.dgvBarcodeIdnrk.TabIndex = 31;
-            this.dgvBarcodeIdnrk.Tag = true;
-            this.dgvBarcodeIdnrk.TotalSumColumns = null;
-            this.dgvBarcodeIdnrk.ViewRowFilter = "";
-            this.dgvBarcodeIdnrk.VirtualNodes = false;
-            this.dgvBarcodeIdnrk.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBarcodeIdnrk_CellDoubleClick);
-            // 
-            // INSPECTITEM
-            // 
-            this.INSPECTITEM.DataPropertyName = "INSPECTITEM";
-            this.INSPECTITEM.HeaderText = "检验项目";
-            this.INSPECTITEM.MinimumWidth = 8;
-            this.INSPECTITEM.Name = "INSPECTITEM";
-            this.INSPECTITEM.ReadOnly = true;
-            this.INSPECTITEM.Width = 150;
-            // 
-            // COUNTS
-            // 
-            this.COUNTS.DataPropertyName = "COUNTS";
-            this.COUNTS.HeaderText = "检验数量";
-            this.COUNTS.MinimumWidth = 8;
-            this.COUNTS.Name = "COUNTS";
-            this.COUNTS.ReadOnly = true;
-            this.COUNTS.Width = 150;
-            // 
-            // ISQUALIFIED
-            // 
-            this.ISQUALIFIED.DataPropertyName = "ISQUALIFIED";
-            this.ISQUALIFIED.HeaderText = "不合格数量";
-            this.ISQUALIFIED.MinimumWidth = 8;
-            this.ISQUALIFIED.Name = "ISQUALIFIED";
-            this.ISQUALIFIED.ReadOnly = true;
-            this.ISQUALIFIED.Width = 150;
-            // 
-            // BUHEGELV
-            // 
-            this.BUHEGELV.DataPropertyName = "BUHEGELV";
-            this.BUHEGELV.HeaderText = "不合格率";
-            this.BUHEGELV.MinimumWidth = 8;
-            this.BUHEGELV.Name = "BUHEGELV";
-            this.BUHEGELV.ReadOnly = true;
-            this.BUHEGELV.Width = 150;
-            // 
-            // ZHANBI
-            // 
-            this.ZHANBI.DataPropertyName = "ZHANBI";
-            this.ZHANBI.HeaderText = "不合格占比";
-            this.ZHANBI.MinimumWidth = 8;
-            this.ZHANBI.Name = "ZHANBI";
-            this.ZHANBI.ReadOnly = true;
-            this.ZHANBI.Width = 150;
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			this.dgvBarcodeIdnrk.ColumnTreeView = null;
+			this.dgvBarcodeIdnrk.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.dgvBarcodeIdnrk.DynamicColumnName = "";
+			this.dgvBarcodeIdnrk.EnableHeadersVisualStyles = false;
+			this.dgvBarcodeIdnrk.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvBarcodeIdnrk.FormatQuantityColumns = null;
+			this.dgvBarcodeIdnrk.HasNode = false;
+			this.dgvBarcodeIdnrk.HorizontalMergeColumn = null;
+			this.dgvBarcodeIdnrk.IsAutoCountSum = true;
+			this.dgvBarcodeIdnrk.IsAutoResizeColumns = false;
+			this.dgvBarcodeIdnrk.IsClickF12 = false;
+			this.dgvBarcodeIdnrk.IsOpenMergeCellFlag = false;
+			this.dgvBarcodeIdnrk.IsSubTotalFlag = false;
+			this.dgvBarcodeIdnrk.IsTopDeep = false;
+			this.dgvBarcodeIdnrk.Location = new System.Drawing.Point(0, 0);
+			this.dgvBarcodeIdnrk.Margin = new System.Windows.Forms.Padding(0);
+			this.dgvBarcodeIdnrk.MergeColumnNames = null;
+			this.dgvBarcodeIdnrk.MergeDetailColumnNames = null;
+			this.dgvBarcodeIdnrk.MergeDetailOnlyColumn = null;
+			this.dgvBarcodeIdnrk.MergeOnlyColumn = null;
+			this.dgvBarcodeIdnrk.MultiSelect = false;
+			this.dgvBarcodeIdnrk.Name = "dgvBarcodeIdnrk";
+			this.dgvBarcodeIdnrk.ReadOnly = true;
+			this.dgvBarcodeIdnrk.RefreshAtHscroll = false;
+			this.dgvBarcodeIdnrk.RowHeadersWidth = 50;
+			this.dgvBarcodeIdnrk.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvBarcodeIdnrk.RowsDefaultCellStyle = dataGridViewCellStyle3;
+			this.dgvBarcodeIdnrk.RowTemplate.Height = 21;
+			this.dgvBarcodeIdnrk.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvBarcodeIdnrk.Size = new System.Drawing.Size(1279, 421);
+			this.dgvBarcodeIdnrk.SortOrderColumnName = null;
+			this.dgvBarcodeIdnrk.TabIndex = 31;
+			this.dgvBarcodeIdnrk.Tag = true;
+			this.dgvBarcodeIdnrk.TotalSumColumns = null;
+			this.dgvBarcodeIdnrk.ViewRowFilter = "";
+			this.dgvBarcodeIdnrk.VirtualNodes = false;
+			this.dgvBarcodeIdnrk.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBarcodeIdnrk_CellDoubleClick);
+			// 
+			// INSPECTITEM
+			// 
+			this.INSPECTITEM.DataPropertyName = "INSPECTITEM";
+			this.INSPECTITEM.HeaderText = "检验项目";
+			this.INSPECTITEM.MinimumWidth = 8;
+			this.INSPECTITEM.Name = "INSPECTITEM";
+			this.INSPECTITEM.ReadOnly = true;
+			this.INSPECTITEM.Width = 150;
+			// 
+			// COUNTS
+			// 
+			this.COUNTS.DataPropertyName = "COUNTS";
+			this.COUNTS.HeaderText = "检验数量";
+			this.COUNTS.MinimumWidth = 8;
+			this.COUNTS.Name = "COUNTS";
+			this.COUNTS.ReadOnly = true;
+			this.COUNTS.Width = 150;
+			// 
+			// ISQUALIFIED
+			// 
+			this.ISQUALIFIED.DataPropertyName = "ISQUALIFIED";
+			this.ISQUALIFIED.HeaderText = "不合格数量";
+			this.ISQUALIFIED.MinimumWidth = 8;
+			this.ISQUALIFIED.Name = "ISQUALIFIED";
+			this.ISQUALIFIED.ReadOnly = true;
+			this.ISQUALIFIED.Width = 150;
+			// 
+			// BUHEGELV
+			// 
+			this.BUHEGELV.DataPropertyName = "BUHEGELV";
+			this.BUHEGELV.HeaderText = "不合格率";
+			this.BUHEGELV.MinimumWidth = 8;
+			this.BUHEGELV.Name = "BUHEGELV";
+			this.BUHEGELV.ReadOnly = true;
+			this.BUHEGELV.Width = 150;
+			// 
+			// ZHANBI
+			// 
+			this.ZHANBI.DataPropertyName = "ZHANBI";
+			this.ZHANBI.HeaderText = "不合格占比";
+			this.ZHANBI.MinimumWidth = 8;
+			this.ZHANBI.Name = "ZHANBI";
+			this.ZHANBI.ReadOnly = true;
+			this.ZHANBI.Width = 150;
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.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.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(0, 134);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1966, 621);
-            this.tabControl1.TabIndex = 34;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.dgvBarcodeIdnrk);
-            this.tabPage1.Location = new System.Drawing.Point(4, 28);
-            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(1958, 589);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "检验分析汇总";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.dgvQCdata);
-            this.tabPage2.Location = new System.Drawing.Point(4, 28);
-            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(1958, 589);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "检验分析明细";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // dgvQCdata
-            // 
-            this.dgvQCdata.AllowUserToAddRows = false;
-            this.dgvQCdata.AllowUserToDeleteRows = false;
-            this.dgvQCdata.AllowUserToModifyRows = true;
-            this.dgvQCdata.AllowUserToOrderColumns = true;
-            this.dgvQCdata.AllowUserToSortRows = false;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvQCdata.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
-            this.dgvQCdata.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.dgvQCdata.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-            this.dgvQCdata.CellHeight = 23;
-            this.dgvQCdata.ChildNodeColumnName = null;
-            this.dgvQCdata.ChildNodeColumnText = null;
-            this.dgvQCdata.ColumnDeep = 1;
-            this.dgvQCdata.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvQCdata.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
-            this.dgvQCdata.ColumnHeadersHeight = 34;
-            this.dgvQCdata.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvQCdata.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Location = new System.Drawing.Point(0, 89);
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(1311, 443);
+			this.tabControl1.TabIndex = 34;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.dgvBarcodeIdnrk);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Size = new System.Drawing.Size(1303, 417);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "检验分析汇总";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.dgvQCdata);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Size = new System.Drawing.Size(1303, 388);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "检验分析明细";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// dgvQCdata
+			// 
+			this.dgvQCdata.AllowUserToAddRows = false;
+			this.dgvQCdata.AllowUserToDeleteRows = false;
+			this.dgvQCdata.AllowUserToModifyRows = true;
+			this.dgvQCdata.AllowUserToOrderColumns = true;
+			this.dgvQCdata.AllowUserToSortRows = false;
+			dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvQCdata.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+			this.dgvQCdata.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvQCdata.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvQCdata.CellHeight = 23;
+			this.dgvQCdata.ChildNodeColumnName = null;
+			this.dgvQCdata.ChildNodeColumnText = null;
+			this.dgvQCdata.ColumnDeep = 1;
+			this.dgvQCdata.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvQCdata.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+			this.dgvQCdata.ColumnHeadersHeight = 34;
+			this.dgvQCdata.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dgvQCdata.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.BARCODE,
             this.INSPECTITEMS,
             this.INSPECTVALUE,
@@ -522,135 +501,135 @@
             this.USERNAME,
             this.USERCODE,
             this.GOODSCODE});
-            this.dgvQCdata.ColumnTreeView = null;
-            this.dgvQCdata.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.dgvQCdata.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvQCdata.DynamicColumnName = "";
-            this.dgvQCdata.EnableHeadersVisualStyles = false;
-            this.dgvQCdata.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvQCdata.FormatQuantityColumns = null;
-            this.dgvQCdata.HasNode = false;
-            this.dgvQCdata.HorizontalMergeColumn = null;
-            this.dgvQCdata.IsAutoCountSum = true;
-            this.dgvQCdata.IsAutoResizeColumns = false;
-            this.dgvQCdata.IsClickF12 = false;
-            this.dgvQCdata.IsOpenMergeCellFlag = false;
-            this.dgvQCdata.IsSubTotalFlag = false;
-            this.dgvQCdata.IsTopDeep = false;
-            this.dgvQCdata.Location = new System.Drawing.Point(0, 0);
-            this.dgvQCdata.Margin = new System.Windows.Forms.Padding(0);
-            this.dgvQCdata.MergeColumnNames = null;
-            this.dgvQCdata.MergeDetailColumnNames = null;
-            this.dgvQCdata.MergeDetailOnlyColumn = null;
-            this.dgvQCdata.MergeOnlyColumn = null;
-            this.dgvQCdata.MultiSelect = false;
-            this.dgvQCdata.Name = "dgvQCdata";
-            this.dgvQCdata.ReadOnly = true;
-            this.dgvQCdata.RefreshAtHscroll = false;
-            this.dgvQCdata.RowHeadersWidth = 50;
-            this.dgvQCdata.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvQCdata.RowsDefaultCellStyle = dataGridViewCellStyle6;
-            this.dgvQCdata.RowTemplate.Height = 21;
-            this.dgvQCdata.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvQCdata.Size = new System.Drawing.Size(1958, 589);
-            this.dgvQCdata.SortOrderColumnName = null;
-            this.dgvQCdata.TabIndex = 31;
-            this.dgvQCdata.Tag = true;
-            this.dgvQCdata.TotalSumColumns = null;
-            this.dgvQCdata.ViewRowFilter = "";
-            this.dgvQCdata.VirtualNodes = false;
-            // 
-            // BARCODE
-            // 
-            this.BARCODE.DataPropertyName = "BARCODE";
-            this.BARCODE.HeaderText = "条码";
-            this.BARCODE.MinimumWidth = 8;
-            this.BARCODE.Name = "BARCODE";
-            this.BARCODE.ReadOnly = true;
-            this.BARCODE.Width = 150;
-            // 
-            // INSPECTITEMS
-            // 
-            this.INSPECTITEMS.DataPropertyName = "INSPECTITEMS";
-            this.INSPECTITEMS.HeaderText = "检验项目";
-            this.INSPECTITEMS.MinimumWidth = 8;
-            this.INSPECTITEMS.Name = "INSPECTITEMS";
-            this.INSPECTITEMS.ReadOnly = true;
-            this.INSPECTITEMS.Width = 150;
-            // 
-            // INSPECTVALUE
-            // 
-            this.INSPECTVALUE.DataPropertyName = "INSPECTVALUE";
-            this.INSPECTVALUE.HeaderText = "检验值";
-            this.INSPECTVALUE.MinimumWidth = 8;
-            this.INSPECTVALUE.Name = "INSPECTVALUE";
-            this.INSPECTVALUE.ReadOnly = true;
-            this.INSPECTVALUE.Width = 150;
-            // 
-            // CREATETIME
-            // 
-            this.CREATETIME.DataPropertyName = "CREATETIME";
-            this.CREATETIME.HeaderText = "检验时间";
-            this.CREATETIME.MinimumWidth = 8;
-            this.CREATETIME.Name = "CREATETIME";
-            this.CREATETIME.ReadOnly = true;
-            this.CREATETIME.Width = 150;
-            // 
-            // USERNAME
-            // 
-            this.USERNAME.DataPropertyName = "USERNAME";
-            this.USERNAME.HeaderText = "检验姓名";
-            this.USERNAME.MinimumWidth = 8;
-            this.USERNAME.Name = "USERNAME";
-            this.USERNAME.ReadOnly = true;
-            this.USERNAME.Width = 150;
-            // 
-            // USERCODE
-            // 
-            this.USERCODE.DataPropertyName = "USERCODE";
-            this.USERCODE.HeaderText = "检验工号";
-            this.USERCODE.MinimumWidth = 8;
-            this.USERCODE.Name = "USERCODE";
-            this.USERCODE.ReadOnly = true;
-            this.USERCODE.Width = 150;
-            // 
-            // GOODSCODE
-            // 
-            this.GOODSCODE.DataPropertyName = "GOODSCODE";
-            this.GOODSCODE.HeaderText = "产品型号";
-            this.GOODSCODE.MinimumWidth = 8;
-            this.GOODSCODE.Name = "GOODSCODE";
-            this.GOODSCODE.ReadOnly = true;
-            this.GOODSCODE.Width = 150;
-            // 
-            // F_RPT_080116
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1970, 808);
-            this.Controls.Add(this.tabControl1);
-            this.Controls.Add(this.gbxCondition);
-            this.Controls.Add(this.tsrOperate);
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
-            this.Name = "F_RPT_080116";
-            this.Text = "QC检验分析汇总表";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_080116_FormClosed);
-            this.Load += new System.EventHandler(this.F_RPT_080116_Load);
-            this.tsrOperate.ResumeLayout(false);
-            this.tsrOperate.PerformLayout();
-            this.gbxCondition.ResumeLayout(false);
-            this.gbxCondition.PerformLayout();
-            this.typeInspection.ResumeLayout(false);
-            this.typeInspection.PerformLayout();
-            this.Historical.ResumeLayout(false);
-            this.Historical.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvBarcodeIdnrk)).EndInit();
-            this.tabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvQCdata)).EndInit();
-            this.ResumeLayout(false);
+			this.dgvQCdata.ColumnTreeView = null;
+			this.dgvQCdata.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.dgvQCdata.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.dgvQCdata.DynamicColumnName = "";
+			this.dgvQCdata.EnableHeadersVisualStyles = false;
+			this.dgvQCdata.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvQCdata.FormatQuantityColumns = null;
+			this.dgvQCdata.HasNode = false;
+			this.dgvQCdata.HorizontalMergeColumn = null;
+			this.dgvQCdata.IsAutoCountSum = true;
+			this.dgvQCdata.IsAutoResizeColumns = false;
+			this.dgvQCdata.IsClickF12 = false;
+			this.dgvQCdata.IsOpenMergeCellFlag = false;
+			this.dgvQCdata.IsSubTotalFlag = false;
+			this.dgvQCdata.IsTopDeep = false;
+			this.dgvQCdata.Location = new System.Drawing.Point(0, 0);
+			this.dgvQCdata.Margin = new System.Windows.Forms.Padding(0);
+			this.dgvQCdata.MergeColumnNames = null;
+			this.dgvQCdata.MergeDetailColumnNames = null;
+			this.dgvQCdata.MergeDetailOnlyColumn = null;
+			this.dgvQCdata.MergeOnlyColumn = null;
+			this.dgvQCdata.MultiSelect = false;
+			this.dgvQCdata.Name = "dgvQCdata";
+			this.dgvQCdata.ReadOnly = true;
+			this.dgvQCdata.RefreshAtHscroll = false;
+			this.dgvQCdata.RowHeadersWidth = 50;
+			this.dgvQCdata.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvQCdata.RowsDefaultCellStyle = dataGridViewCellStyle6;
+			this.dgvQCdata.RowTemplate.Height = 21;
+			this.dgvQCdata.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dgvQCdata.Size = new System.Drawing.Size(1303, 388);
+			this.dgvQCdata.SortOrderColumnName = null;
+			this.dgvQCdata.TabIndex = 31;
+			this.dgvQCdata.Tag = true;
+			this.dgvQCdata.TotalSumColumns = null;
+			this.dgvQCdata.ViewRowFilter = "";
+			this.dgvQCdata.VirtualNodes = false;
+			// 
+			// BARCODE
+			// 
+			this.BARCODE.DataPropertyName = "BARCODE";
+			this.BARCODE.HeaderText = "条码";
+			this.BARCODE.MinimumWidth = 8;
+			this.BARCODE.Name = "BARCODE";
+			this.BARCODE.ReadOnly = true;
+			this.BARCODE.Width = 150;
+			// 
+			// INSPECTITEMS
+			// 
+			this.INSPECTITEMS.DataPropertyName = "INSPECTITEMS";
+			this.INSPECTITEMS.HeaderText = "检验项目";
+			this.INSPECTITEMS.MinimumWidth = 8;
+			this.INSPECTITEMS.Name = "INSPECTITEMS";
+			this.INSPECTITEMS.ReadOnly = true;
+			this.INSPECTITEMS.Width = 150;
+			// 
+			// INSPECTVALUE
+			// 
+			this.INSPECTVALUE.DataPropertyName = "INSPECTVALUE";
+			this.INSPECTVALUE.HeaderText = "检验值";
+			this.INSPECTVALUE.MinimumWidth = 8;
+			this.INSPECTVALUE.Name = "INSPECTVALUE";
+			this.INSPECTVALUE.ReadOnly = true;
+			this.INSPECTVALUE.Width = 150;
+			// 
+			// CREATETIME
+			// 
+			this.CREATETIME.DataPropertyName = "CREATETIME";
+			this.CREATETIME.HeaderText = "检验时间";
+			this.CREATETIME.MinimumWidth = 8;
+			this.CREATETIME.Name = "CREATETIME";
+			this.CREATETIME.ReadOnly = true;
+			this.CREATETIME.Width = 150;
+			// 
+			// USERNAME
+			// 
+			this.USERNAME.DataPropertyName = "USERNAME";
+			this.USERNAME.HeaderText = "检验姓名";
+			this.USERNAME.MinimumWidth = 8;
+			this.USERNAME.Name = "USERNAME";
+			this.USERNAME.ReadOnly = true;
+			this.USERNAME.Width = 150;
+			// 
+			// USERCODE
+			// 
+			this.USERCODE.DataPropertyName = "USERCODE";
+			this.USERCODE.HeaderText = "检验工号";
+			this.USERCODE.MinimumWidth = 8;
+			this.USERCODE.Name = "USERCODE";
+			this.USERCODE.ReadOnly = true;
+			this.USERCODE.Width = 150;
+			// 
+			// GOODSCODE
+			// 
+			this.GOODSCODE.DataPropertyName = "GOODSCODE";
+			this.GOODSCODE.HeaderText = "产品型号";
+			this.GOODSCODE.MinimumWidth = 8;
+			this.GOODSCODE.Name = "GOODSCODE";
+			this.GOODSCODE.ReadOnly = true;
+			this.GOODSCODE.Width = 150;
+			// 
+			// F_RPT_080116
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1283, 568);
+			this.Controls.Add(this.tabControl1);
+			this.Controls.Add(this.gbxCondition);
+			this.Controls.Add(this.tsrOperate);
+			this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.Name = "F_RPT_080116";
+			this.Text = "QC检验分析汇总表";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_080116_FormClosed);
+			this.Load += new System.EventHandler(this.F_RPT_080116_Load);
+			this.tsrOperate.ResumeLayout(false);
+			this.tsrOperate.PerformLayout();
+			this.gbxCondition.ResumeLayout(false);
+			this.gbxCondition.PerformLayout();
+			this.typeInspection.ResumeLayout(false);
+			this.typeInspection.PerformLayout();
+			this.Historical.ResumeLayout(false);
+			this.Historical.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvBarcodeIdnrk)).EndInit();
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.dgvQCdata)).EndInit();
+			this.ResumeLayout(false);
 
 		}
 

DK.Client/ReportModule/R08/F_RPT_080116.resx

@@ -168,32 +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
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXtJREFUeF7t2EENgEAA
-        A8H6twoJSOCPg9vMaOhj010QshtC9kDIXgjZv0HgZAZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMU
-        gyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGho
-        UjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJ
-        QYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5oUvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCk
-        GDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRIDlIMmhTJQYofmhQ/NCkamhQNTYpBkyI5SDFoUiQHKX5o
-        UvzQpGhoUjQ0KQZNiuQgxaBJkRyk+KFJ8UOToqFJ0dCkGDQpkoMUgyZFcpDihybFD02KhiZFQ5Ni0KRI
-        DlIMmpQPCToumIUZKRoAAAAASUVORK5CYII=
+        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
-        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
-        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
-        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
-        QmCC
+        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
-        vAAADrwBlbxySQAAAJVJREFUaEPt0KEVwyAYAOEsGInGZQUsioGYgF3iWOLvq8hrU1ly7sSnzt12HEdo
-        XWstxhgx54ztN+o/TgU4FeBUgFMBTgU4FeBUgFMBTgU4FeBUgFMBt6k559C6WqtTn+ZUgFMBpZTP1JRS
-        aN019TxPpz7FqQCnApwKcCrAqQCnApwKcCrgPbX37tQn3abu+x5a9z31BTyGRAWd15QmAAAAAElFTkSu
-        QmCC
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="INSPECTITEM.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -1960,6 +1960,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                         sql.Append("    AND TP_PM_GroutingDaily.CreateTime <= :CreateTimeEnd ");
                         parameters.Add(new OracleParameter(":CreateTimeEnd", OracleDbType.Date, se.CreateTimeEnd.Value, ParameterDirection.Input));
                     }
+                    // 产品类别 
+                    if (!string.IsNullOrEmpty(se.GoodsTypeCode))
+                    {
+                        //sql.Append("      AND instr(',' || :GoodsTypeIDS ||',',','||gt.GOODSTYPECode||',')=1");
+                        sql.Append("      AND instr(gt.GOODSTYPECode,:GoodsTypeCode)=1");
+                        parameters.Add(new OracleParameter(":GoodsTypeCode", OracleDbType.NVarchar2, se.GoodsTypeCode, ParameterDirection.Input));
+                    }
+
                 }
                 sql.Append("    order by TP_PM_FinishedProduct.UpdateTime desc");
                 DataTable data = conn.GetSqlResultToDt(sql.ToString(), parameters.ToArray());
@@ -2035,8 +2043,10 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                             "             TP_PM_FinishedProduct.GoodsLevelTypeID, " +
                             "             TP_SYS_GoodsLevelType.GOODSLEVELTYPENAME, " +
                             "             TP_PM_GroutingDailyDetail.SecurityCode, " +
-                            "             TP_PM_FinishedProduct.FHUSERCODE, " +
-                            "             TP_PM_FinishedProduct.FHTIME, " +
+                            //"             TP_PM_FinishedProduct.FHUSERCODE, " +
+                            //"             TP_PM_FinishedProduct.FHTIME, " +
+                            "             nvl(TP_PM_FinishedProduct.FHUSERCODE,TP_PM_FinishedProduct.LCFHUSERCODE)FHUSERCODE, " +
+                            "             nvl(TP_PM_FinishedProduct.FHTIME,TP_PM_FinishedProduct.LCFHTIME)FHTIME, " +
                             "             odr.ORDERNO, " +
                             //20210116 产成品明细表加入注浆重量等重量信息
                             "      TP_PM_GroutingDailyDetail.SLURRY_WEIGHT, " +
@@ -2076,6 +2086,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                             "            left join TP_SYS_GoodsLevelType on TP_SYS_GoodsLevelType.GoodsLevelTypeID=TP_PM_FinishedProduct.GoodsLevelTypeID " +
                             "            left join tp_mst_logo on TP_PM_FinishedProduct.logoid=tp_mst_logo.logoid " +
                             "            left join TP_MST_Goods Goods  on TP_PM_FinishedProduct.GoodsID=Goods.GoodsID " +
+                            "            left join tp_mst_goodstype gt  on gt.goodstypeid=Goods.goodstypeid " +
                             "        Where 1=1 and  TP_PM_FinishedProduct.ValueFlag = 1 " +
                             "                  and TP_PM_FinishedProduct.AccountID=:AccountID ";
 

WCF.Service/WCF.DataModels/SearchEntity/RPT/RPT010402_SE.cs

@@ -115,6 +115,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set;
         }
 
+        /// <summary>
+        /// 产品类型
+        /// </summary>
+        [DataMember]
+        public string GoodsTypeCode 
+        { 
+            get; 
+            set; 
+        }
         /*
         /////////////////
         ////结果/////