Преглед на файлове

工序漏扫明细表增加快捷键

dk-xuwei преди 5 години
родител
ревизия
bf397ae4e5

+ 724 - 654
DK.Client/ReportModule/R01/M02/F_RPT_010201_1.Designer.cs

@@ -28,357 +28,397 @@
         /// </summary>
         private void InitializeComponent()
         {
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_010201_1));
-			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 dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-			this.tsbtnMissed = new System.Windows.Forms.ToolStripButton();
-			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.lblOrganization = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
-			this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
-			this.dkcompleteProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-			this.dkmissingProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-			this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
-			this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-			this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
-			this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.lblAccountDateStart = 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.dgvReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.MissID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsType = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MissProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MissProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MissProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CompleteProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CompleteProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CompleteProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.UserName0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CreateTime0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.OrganizationCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.OrganizationFullName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.MissUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.repaircode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.prepaircode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.barcodecount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
-			this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.tsrOperate.SuspendLayout();
-			this.gbxCondition.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).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_010201_1));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnMissed = new System.Windows.Forms.ToolStripButton();
+            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.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblOrganization = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.dkcompleteProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dkmissingProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.lblAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.lblAccountDateStart = 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.dgvReportModule = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.MissID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LogoCodeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MissProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MissProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MissProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CompleteProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CompleteProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CompleteProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ProcedureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UserName0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CreateTime0 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OrganizationCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OrganizationFullName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MissUserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.repaircode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.prepaircode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.barcodecount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tsrOperate.SuspendLayout();
+            this.gbxCondition.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).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.tsbtnMissed,
             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";
-			// 
-			// tsbtnMissed
-			// 
-			this.tsbtnMissed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-			this.tsbtnMissed.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnMissed.Image")));
-			this.tsbtnMissed.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnMissed.Name = "tsbtnMissed";
-			this.tsbtnMissed.Size = new System.Drawing.Size(57, 32);
-			this.tsbtnMissed.Text = "漏扫工号";
-			this.tsbtnMissed.Click += new System.EventHandler(this.tsbtnMissed_Click);
-			// 
-			// 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.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";
+            // 
+            // tsbtnMissed
+            // 
+            this.tsbtnMissed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsbtnMissed.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnMissed.Image")));
+            this.tsbtnMissed.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnMissed.Name = "tsbtnMissed";
+            this.tsbtnMissed.Size = new System.Drawing.Size(95, 41);
+            this.tsbtnMissed.Text = "漏扫工号(&Z)";
+            this.tsbtnMissed.Click += new System.EventHandler(this.tsbtnMissed_Click);
+            // 
+            // 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.scbGoods);
-			this.gbxCondition.Controls.Add(this.lblGoods);
-			this.gbxCondition.Controls.Add(this.lblOrganization);
-			this.gbxCondition.Controls.Add(this.scbOrganization);
-			this.gbxCondition.Controls.Add(this.lblGoodsType);
-			this.gbxCondition.Controls.Add(this.scbGoodsType);
-			this.gbxCondition.Controls.Add(this.dkcompleteProcedureSearchBox);
-			this.gbxCondition.Controls.Add(this.dkmissingProcedureSearchBox);
-			this.gbxCondition.Controls.Add(this.dkProcedureSearchBox);
-			this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
-			this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
-			this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
-			this.gbxCondition.Controls.Add(this.lblAccountDateStart);
-			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(1119, 80);
-			this.gbxCondition.TabIndex = 1;
-			this.gbxCondition.TabStop = false;
-			this.gbxCondition.Text = "查询条件 ▼";
-			// 
-			// lblOrganization
-			// 
-			this.lblOrganization.AutoSize = true;
-			this.lblOrganization.BackColor = System.Drawing.Color.Transparent;
-			this.lblOrganization.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblOrganization.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblOrganization.Location = new System.Drawing.Point(15, 23);
-			this.lblOrganization.Name = "lblOrganization";
-			this.lblOrganization.Size = new System.Drawing.Size(53, 12);
-			this.lblOrganization.TabIndex = 51;
-			this.lblOrganization.Text = "漏扫部门";
-			// 
-			// scbOrganization
-			// 
-			this.scbOrganization.CheckedData = null;
-			this.scbOrganization.IsOnlyDisplayEnd = false;
-			this.scbOrganization.Location = new System.Drawing.Point(74, 20);
-			this.scbOrganization.MultiSelect = true;
-			this.scbOrganization.Name = "scbOrganization";
-			this.scbOrganization.Size = new System.Drawing.Size(134, 21);
-			this.scbOrganization.TabIndex = 50;
-			// 
-			// lblGoodsType
-			// 
-			this.lblGoodsType.AutoSize = true;
-			this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
-			this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGoodsType.Location = new System.Drawing.Point(226, 24);
-			this.lblGoodsType.Name = "lblGoodsType";
-			this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
-			this.lblGoodsType.TabIndex = 23;
-			this.lblGoodsType.Text = "产品类别";
-			// 
-			// scbGoodsType
-			// 
-			this.scbGoodsType.CheckedData = null;
-			this.scbGoodsType.IsOnlyDisplayEnd = false;
-			this.scbGoodsType.Location = new System.Drawing.Point(285, 20);
-			this.scbGoodsType.Name = "scbGoodsType";
-			this.scbGoodsType.Size = new System.Drawing.Size(134, 21);
-			this.scbGoodsType.TabIndex = 22;
-			// 
-			// dkcompleteProcedureSearchBox
-			// 
-			this.dkcompleteProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
-			this.dkcompleteProcedureSearchBox.DataSource = null;
-			this.dkcompleteProcedureSearchBox.Enabled = true;
-			this.dkcompleteProcedureSearchBox.IsEnablePurview = false;
-			this.dkcompleteProcedureSearchBox.IsMustInput = false;
-			this.dkcompleteProcedureSearchBox.Location = new System.Drawing.Point(226, 50);
-			this.dkcompleteProcedureSearchBox.ModelType = null;
-			this.dkcompleteProcedureSearchBox.Name = "dkcompleteProcedureSearchBox";
-			this.dkcompleteProcedureSearchBox.ProcedureCode = "";
-			this.dkcompleteProcedureSearchBox.ProcedureID = null;
-			this.dkcompleteProcedureSearchBox.ProcedureIDS = null;
-			this.dkcompleteProcedureSearchBox.ProcedureName = null;
-			this.dkcompleteProcedureSearchBox.Purview = null;
-			this.dkcompleteProcedureSearchBox.PurviewType = ((byte)(0));
-			this.dkcompleteProcedureSearchBox.SelectMore = true;
-			this.dkcompleteProcedureSearchBox.Size = new System.Drawing.Size(193, 21);
-			this.dkcompleteProcedureSearchBox.TabIndex = 5;
-			this.dkcompleteProcedureSearchBox.Title = "完成工序";
-			this.dkcompleteProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-			// 
-			// dkmissingProcedureSearchBox
-			// 
-			this.dkmissingProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
-			this.dkmissingProcedureSearchBox.DataSource = null;
-			this.dkmissingProcedureSearchBox.Enabled = true;
-			this.dkmissingProcedureSearchBox.IsEnablePurview = false;
-			this.dkmissingProcedureSearchBox.IsMustInput = false;
-			this.dkmissingProcedureSearchBox.Location = new System.Drawing.Point(15, 50);
-			this.dkmissingProcedureSearchBox.ModelType = null;
-			this.dkmissingProcedureSearchBox.Name = "dkmissingProcedureSearchBox";
-			this.dkmissingProcedureSearchBox.ProcedureCode = "";
-			this.dkmissingProcedureSearchBox.ProcedureID = null;
-			this.dkmissingProcedureSearchBox.ProcedureIDS = null;
-			this.dkmissingProcedureSearchBox.ProcedureName = null;
-			this.dkmissingProcedureSearchBox.Purview = null;
-			this.dkmissingProcedureSearchBox.PurviewType = ((byte)(0));
-			this.dkmissingProcedureSearchBox.SelectMore = true;
-			this.dkmissingProcedureSearchBox.Size = new System.Drawing.Size(193, 21);
-			this.dkmissingProcedureSearchBox.TabIndex = 4;
-			this.dkmissingProcedureSearchBox.Title = "漏扫工序";
-			this.dkmissingProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-			// 
-			// dkProcedureSearchBox
-			// 
-			this.dkProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
-			this.dkProcedureSearchBox.DataSource = null;
-			this.dkProcedureSearchBox.Enabled = true;
-			this.dkProcedureSearchBox.IsEnablePurview = false;
-			this.dkProcedureSearchBox.IsMustInput = false;
-			this.dkProcedureSearchBox.Location = new System.Drawing.Point(670, 20);
-			this.dkProcedureSearchBox.ModelType = null;
-			this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
-			this.dkProcedureSearchBox.ProcedureCode = "";
-			this.dkProcedureSearchBox.ProcedureID = null;
-			this.dkProcedureSearchBox.ProcedureIDS = null;
-			this.dkProcedureSearchBox.ProcedureName = null;
-			this.dkProcedureSearchBox.Purview = null;
-			this.dkProcedureSearchBox.PurviewType = ((byte)(0));
-			this.dkProcedureSearchBox.SelectMore = true;
-			this.dkProcedureSearchBox.Size = new System.Drawing.Size(193, 21);
-			this.dkProcedureSearchBox.TabIndex = 3;
-			this.dkProcedureSearchBox.Title = "校验工序";
-			this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
-			// 
-			// dtpAccountDateEnd
-			// 
-			this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
-			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(730, 50);
-			this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
-			this.dtpAccountDateEnd.Size = new System.Drawing.Size(133, 21);
-			this.dtpAccountDateEnd.TabIndex = 7;
-			// 
-			// dtpAccountDateStart
-			// 
-			this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
-			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(519, 50);
-			this.dtpAccountDateStart.Name = "dtpAccountDateStart";
-			this.dtpAccountDateStart.Size = new System.Drawing.Size(133, 21);
-			this.dtpAccountDateStart.TabIndex = 6;
-			// 
-			// 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(670, 54);
-			this.lblAccountDateEnd.Name = "lblAccountDateEnd";
-			this.lblAccountDateEnd.Size = new System.Drawing.Size(53, 12);
-			this.lblAccountDateEnd.TabIndex = 6;
-			this.lblAccountDateEnd.Text = "  至    ";
-			// 
-			// 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(435, 54);
-			this.lblAccountDateStart.Name = "lblAccountDateStart";
-			this.lblAccountDateStart.Size = new System.Drawing.Size(77, 12);
-			this.lblAccountDateStart.TabIndex = 4;
-			this.lblAccountDateStart.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(1016, 45);
-			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(925, 45);
-			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);
-			// 
-			// dgvReportModule
-			// 
-			this.dgvReportModule.AllowUserToAddRows = false;
-			this.dgvReportModule.AllowUserToDeleteRows = false;
-			this.dgvReportModule.AllowUserToModifyRows = true;
-			this.dgvReportModule.AllowUserToOrderColumns = true;
-			this.dgvReportModule.AllowUserToSortRows = false;
-			dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-			this.dgvReportModule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
-			this.dgvReportModule.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.scbGoods);
+            this.gbxCondition.Controls.Add(this.lblGoods);
+            this.gbxCondition.Controls.Add(this.lblOrganization);
+            this.gbxCondition.Controls.Add(this.scbOrganization);
+            this.gbxCondition.Controls.Add(this.lblGoodsType);
+            this.gbxCondition.Controls.Add(this.scbGoodsType);
+            this.gbxCondition.Controls.Add(this.dkcompleteProcedureSearchBox);
+            this.gbxCondition.Controls.Add(this.dkmissingProcedureSearchBox);
+            this.gbxCondition.Controls.Add(this.dkProcedureSearchBox);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+            this.gbxCondition.Controls.Add(this.lblAccountDateEnd);
+            this.gbxCondition.Controls.Add(this.lblAccountDateStart);
+            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);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
+            this.gbxCondition.Size = new System.Drawing.Size(1492, 100);
+            this.gbxCondition.TabIndex = 1;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.Location = new System.Drawing.Point(692, 25);
+            this.scbGoods.Margin = new System.Windows.Forms.Padding(4);
+            this.scbGoods.MultiSelect = true;
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(177, 26);
+            this.scbGoods.TabIndex = 53;
+            // 
+            // lblGoods
+            // 
+            this.lblGoods.AutoSize = true;
+            this.lblGoods.BackColor = System.Drawing.Color.Transparent;
+            this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoods.Location = new System.Drawing.Point(613, 32);
+            this.lblGoods.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoods.Name = "lblGoods";
+            this.lblGoods.Size = new System.Drawing.Size(67, 15);
+            this.lblGoods.TabIndex = 52;
+            this.lblGoods.Text = "产品名称";
+            // 
+            // lblOrganization
+            // 
+            this.lblOrganization.AutoSize = true;
+            this.lblOrganization.BackColor = System.Drawing.Color.Transparent;
+            this.lblOrganization.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblOrganization.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblOrganization.Location = new System.Drawing.Point(20, 29);
+            this.lblOrganization.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblOrganization.Name = "lblOrganization";
+            this.lblOrganization.Size = new System.Drawing.Size(67, 15);
+            this.lblOrganization.TabIndex = 51;
+            this.lblOrganization.Text = "漏扫部门";
+            // 
+            // scbOrganization
+            // 
+            this.scbOrganization.CheckedData = null;
+            this.scbOrganization.IsOnlyDisplayEnd = false;
+            this.scbOrganization.Location = new System.Drawing.Point(99, 25);
+            this.scbOrganization.Margin = new System.Windows.Forms.Padding(4);
+            this.scbOrganization.MultiSelect = true;
+            this.scbOrganization.Name = "scbOrganization";
+            this.scbOrganization.Size = new System.Drawing.Size(179, 26);
+            this.scbOrganization.TabIndex = 50;
+            // 
+            // lblGoodsType
+            // 
+            this.lblGoodsType.AutoSize = true;
+            this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
+            this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGoodsType.Location = new System.Drawing.Point(301, 30);
+            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.TabIndex = 23;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(380, 25);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(179, 26);
+            this.scbGoodsType.TabIndex = 22;
+            // 
+            // dkcompleteProcedureSearchBox
+            // 
+            this.dkcompleteProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkcompleteProcedureSearchBox.DataSource = null;
+            this.dkcompleteProcedureSearchBox.Enabled = true;
+            this.dkcompleteProcedureSearchBox.IsEnablePurview = false;
+            this.dkcompleteProcedureSearchBox.IsMustInput = false;
+            this.dkcompleteProcedureSearchBox.Location = new System.Drawing.Point(301, 62);
+            this.dkcompleteProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+            this.dkcompleteProcedureSearchBox.ModelType = null;
+            this.dkcompleteProcedureSearchBox.Name = "dkcompleteProcedureSearchBox";
+            this.dkcompleteProcedureSearchBox.ProcedureCode = "";
+            this.dkcompleteProcedureSearchBox.ProcedureID = null;
+            this.dkcompleteProcedureSearchBox.ProcedureIDS = null;
+            this.dkcompleteProcedureSearchBox.ProcedureName = null;
+            this.dkcompleteProcedureSearchBox.Purview = null;
+            this.dkcompleteProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkcompleteProcedureSearchBox.SelectMore = true;
+            this.dkcompleteProcedureSearchBox.Size = new System.Drawing.Size(257, 26);
+            this.dkcompleteProcedureSearchBox.TabIndex = 5;
+            this.dkcompleteProcedureSearchBox.Title = "完成工序";
+            this.dkcompleteProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkmissingProcedureSearchBox
+            // 
+            this.dkmissingProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkmissingProcedureSearchBox.DataSource = null;
+            this.dkmissingProcedureSearchBox.Enabled = true;
+            this.dkmissingProcedureSearchBox.IsEnablePurview = false;
+            this.dkmissingProcedureSearchBox.IsMustInput = false;
+            this.dkmissingProcedureSearchBox.Location = new System.Drawing.Point(20, 62);
+            this.dkmissingProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+            this.dkmissingProcedureSearchBox.ModelType = null;
+            this.dkmissingProcedureSearchBox.Name = "dkmissingProcedureSearchBox";
+            this.dkmissingProcedureSearchBox.ProcedureCode = "";
+            this.dkmissingProcedureSearchBox.ProcedureID = null;
+            this.dkmissingProcedureSearchBox.ProcedureIDS = null;
+            this.dkmissingProcedureSearchBox.ProcedureName = null;
+            this.dkmissingProcedureSearchBox.Purview = null;
+            this.dkmissingProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkmissingProcedureSearchBox.SelectMore = true;
+            this.dkmissingProcedureSearchBox.Size = new System.Drawing.Size(257, 26);
+            this.dkmissingProcedureSearchBox.TabIndex = 4;
+            this.dkmissingProcedureSearchBox.Title = "漏扫工序";
+            this.dkmissingProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkProcedureSearchBox
+            // 
+            this.dkProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkProcedureSearchBox.DataSource = null;
+            this.dkProcedureSearchBox.Enabled = true;
+            this.dkProcedureSearchBox.IsEnablePurview = false;
+            this.dkProcedureSearchBox.IsMustInput = false;
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(893, 25);
+            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+            this.dkProcedureSearchBox.ModelType = null;
+            this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
+            this.dkProcedureSearchBox.ProcedureCode = "";
+            this.dkProcedureSearchBox.ProcedureID = null;
+            this.dkProcedureSearchBox.ProcedureIDS = null;
+            this.dkProcedureSearchBox.ProcedureName = null;
+            this.dkProcedureSearchBox.Purview = null;
+            this.dkProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkProcedureSearchBox.SelectMore = true;
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(257, 26);
+            this.dkProcedureSearchBox.TabIndex = 3;
+            this.dkProcedureSearchBox.Title = "校验工序";
+            this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dtpAccountDateEnd
+            // 
+            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
+            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(973, 62);
+            this.dtpAccountDateEnd.Margin = new System.Windows.Forms.Padding(4);
+            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+            this.dtpAccountDateEnd.Size = new System.Drawing.Size(176, 25);
+            this.dtpAccountDateEnd.TabIndex = 7;
+            // 
+            // dtpAccountDateStart
+            // 
+            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
+            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(692, 62);
+            this.dtpAccountDateStart.Margin = new System.Windows.Forms.Padding(4);
+            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+            this.dtpAccountDateStart.Size = new System.Drawing.Size(176, 25);
+            this.dtpAccountDateStart.TabIndex = 6;
+            // 
+            // 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(893, 68);
+            this.lblAccountDateEnd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblAccountDateEnd.Name = "lblAccountDateEnd";
+            this.lblAccountDateEnd.Size = new System.Drawing.Size(70, 15);
+            this.lblAccountDateEnd.TabIndex = 6;
+            this.lblAccountDateEnd.Text = "  至    ";
+            // 
+            // 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(580, 68);
+            this.lblAccountDateStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblAccountDateStart.Name = "lblAccountDateStart";
+            this.lblAccountDateStart.Size = new System.Drawing.Size(97, 15);
+            this.lblAccountDateStart.TabIndex = 4;
+            this.lblAccountDateStart.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(1355, 56);
+            this.btnClearCondition.Margin = new System.Windows.Forms.Padding(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(1233, 56);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(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);
+            // 
+            // dgvReportModule
+            // 
+            this.dgvReportModule.AllowUserToAddRows = false;
+            this.dgvReportModule.AllowUserToDeleteRows = false;
+            this.dgvReportModule.AllowUserToModifyRows = true;
+            this.dgvReportModule.AllowUserToOrderColumns = true;
+            this.dgvReportModule.AllowUserToSortRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvReportModule.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvReportModule.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.dgvReportModule.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-			this.dgvReportModule.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
-			this.dgvReportModule.CellHeight = 23;
-			this.dgvReportModule.ChildNodeColumnName = null;
-			this.dgvReportModule.ChildNodeColumnText = null;
-			this.dgvReportModule.ColumnDeep = 1;
-			this.dgvReportModule.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-			dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-			dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White;
-			dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-			dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-			dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-			this.dgvReportModule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
-			this.dgvReportModule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-			this.dgvReportModule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dgvReportModule.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvReportModule.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvReportModule.CellHeight = 23;
+            this.dgvReportModule.ChildNodeColumnName = null;
+            this.dgvReportModule.ChildNodeColumnText = null;
+            this.dgvReportModule.ColumnDeep = 1;
+            this.dgvReportModule.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.dgvReportModule.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvReportModule.ColumnHeadersHeight = 29;
+            this.dgvReportModule.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvReportModule.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.MissID,
             this.BarCode,
             this.LogoCodeName,
@@ -406,315 +446,345 @@
             this.prepaircode,
             this.OrganizationName,
             this.barcodecount});
-			this.dgvReportModule.ColumnTreeView = null;
-			this.dgvReportModule.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.dgvReportModule.DynamicColumnName = "";
-			this.dgvReportModule.EnableHeadersVisualStyles = false;
-			this.dgvReportModule.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.dgvReportModule.FormatQuantityColumns = null;
-			this.dgvReportModule.HorizontalMergeColumn = null;
-			this.dgvReportModule.IsAutoCountSum = true;
-			this.dgvReportModule.IsAutoResizeColumns = false;
-			this.dgvReportModule.IsClickF12 = false;
-			this.dgvReportModule.IsOpenMergeCellFlag = false;
-			this.dgvReportModule.IsSubTotalFlag = false;
-			this.dgvReportModule.IsTopDeep = false;
-			this.dgvReportModule.Location = new System.Drawing.Point(0, 125);
-			this.dgvReportModule.MergeColumnNames = null;
-			this.dgvReportModule.MergeDetailColumnNames = null;
-			this.dgvReportModule.MergeDetailOnlyColumn = null;
-			this.dgvReportModule.MergeOnlyColumn = null;
-			this.dgvReportModule.MultiSelect = false;
-			this.dgvReportModule.Name = "dgvReportModule";
-			this.dgvReportModule.ReadOnly = true;
-			this.dgvReportModule.RefreshAtHscroll = false;
-			this.dgvReportModule.RowHeadersWidth = 50;
-			this.dgvReportModule.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-			this.dgvReportModule.RowsDefaultCellStyle = dataGridViewCellStyle8;
-			this.dgvReportModule.RowTemplate.Height = 21;
-			this.dgvReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvReportModule.Size = new System.Drawing.Size(1119, 356);
-			this.dgvReportModule.SortOrderColumnName = null;
-			this.dgvReportModule.TabIndex = 28;
-			this.dgvReportModule.Tag = true;
-			this.dgvReportModule.TotalSumColumns = null;
-			this.dgvReportModule.ViewRowFilter = "";
-			// 
-			// MissID
-			// 
-			this.MissID.DataPropertyName = "MissID";
-			this.MissID.HeaderText = "漏扫ID";
-			this.MissID.Name = "MissID";
-			this.MissID.ReadOnly = true;
-			this.MissID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.MissID.Visible = false;
-			// 
-			// BarCode
-			// 
-			this.BarCode.DataPropertyName = "BarCode";
-			this.BarCode.HeaderText = "产品条码";
-			this.BarCode.Name = "BarCode";
-			this.BarCode.ReadOnly = true;
-			this.BarCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.BarCode.Width = 90;
-			// 
-			// LogoCodeName
-			// 
-			this.LogoCodeName.DataPropertyName = "LogoCodeName";
-			this.LogoCodeName.HeaderText = "商标";
-			this.LogoCodeName.Name = "LogoCodeName";
-			this.LogoCodeName.ReadOnly = true;
-			// 
-			// GoodsType
-			// 
-			this.GoodsType.DataPropertyName = "GoodsType";
-			this.GoodsType.HeaderText = "产品大类";
-			this.GoodsType.Name = "GoodsType";
-			this.GoodsType.ReadOnly = true;
-			this.GoodsType.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// GoodsTypeName
-			// 
-			this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
-			this.GoodsTypeName.HeaderText = "产品类别";
-			this.GoodsTypeName.Name = "GoodsTypeName";
-			this.GoodsTypeName.ReadOnly = true;
-			this.GoodsTypeName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.GoodsTypeName.Visible = false;
-			// 
-			// GoodsID
-			// 
-			this.GoodsID.DataPropertyName = "GoodsID";
-			this.GoodsID.HeaderText = "产品ID";
-			this.GoodsID.Name = "GoodsID";
-			this.GoodsID.ReadOnly = true;
-			this.GoodsID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.GoodsID.Visible = false;
-			// 
-			// GoodsCode
-			// 
-			this.GoodsCode.DataPropertyName = "GoodsCode";
-			this.GoodsCode.HeaderText = "产品编码";
-			this.GoodsCode.Name = "GoodsCode";
-			this.GoodsCode.ReadOnly = true;
-			this.GoodsCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.GoodsCode.Width = 70;
-			// 
-			// GoodsName
-			// 
-			this.GoodsName.DataPropertyName = "GoodsName";
-			this.GoodsName.HeaderText = "产品名称";
-			this.GoodsName.Name = "GoodsName";
-			this.GoodsName.ReadOnly = true;
-			this.GoodsName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// MissProcedureID
-			// 
-			this.MissProcedureID.DataPropertyName = "MissProcedureID";
-			this.MissProcedureID.HeaderText = "漏扫工序ID";
-			this.MissProcedureID.Name = "MissProcedureID";
-			this.MissProcedureID.ReadOnly = true;
-			this.MissProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.MissProcedureID.Visible = false;
-			// 
-			// MissProcedureCode
-			// 
-			this.MissProcedureCode.DataPropertyName = "MissProcedureCode";
-			this.MissProcedureCode.HeaderText = "漏扫工序编码";
-			this.MissProcedureCode.Name = "MissProcedureCode";
-			this.MissProcedureCode.ReadOnly = true;
-			this.MissProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.MissProcedureCode.Visible = false;
-			// 
-			// MissProcedureName
-			// 
-			this.MissProcedureName.DataPropertyName = "MissProcedureName";
-			this.MissProcedureName.HeaderText = "漏扫工序";
-			this.MissProcedureName.Name = "MissProcedureName";
-			this.MissProcedureName.ReadOnly = true;
-			this.MissProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// CompleteProcedureID
-			// 
-			this.CompleteProcedureID.DataPropertyName = "CompleteProcedureID";
-			this.CompleteProcedureID.HeaderText = "完成工序ID";
-			this.CompleteProcedureID.Name = "CompleteProcedureID";
-			this.CompleteProcedureID.ReadOnly = true;
-			this.CompleteProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.CompleteProcedureID.Visible = false;
-			// 
-			// CompleteProcedureCode
-			// 
-			this.CompleteProcedureCode.DataPropertyName = "CompleteProcedureCode";
-			this.CompleteProcedureCode.HeaderText = "完成工序编码";
-			this.CompleteProcedureCode.Name = "CompleteProcedureCode";
-			this.CompleteProcedureCode.ReadOnly = true;
-			this.CompleteProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.CompleteProcedureCode.Visible = false;
-			// 
-			// CompleteProcedureName
-			// 
-			this.CompleteProcedureName.DataPropertyName = "CompleteProcedureName";
-			this.CompleteProcedureName.HeaderText = "完成工序";
-			this.CompleteProcedureName.Name = "CompleteProcedureName";
-			this.CompleteProcedureName.ReadOnly = true;
-			this.CompleteProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// ProcedureID
-			// 
-			this.ProcedureID.DataPropertyName = "ProcedureID";
-			this.ProcedureID.HeaderText = "校验工序ID";
-			this.ProcedureID.Name = "ProcedureID";
-			this.ProcedureID.ReadOnly = true;
-			this.ProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.ProcedureID.Visible = false;
-			// 
-			// ProcedureCode
-			// 
-			this.ProcedureCode.DataPropertyName = "ProcedureCode";
-			this.ProcedureCode.HeaderText = "校验工序编码";
-			this.ProcedureCode.Name = "ProcedureCode";
-			this.ProcedureCode.ReadOnly = true;
-			this.ProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.ProcedureCode.Visible = false;
-			// 
-			// ProcedureName
-			// 
-			this.ProcedureName.DataPropertyName = "ProcedureName";
-			this.ProcedureName.HeaderText = "校验工序";
-			this.ProcedureName.Name = "ProcedureName";
-			this.ProcedureName.ReadOnly = true;
-			this.ProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// UserName0
-			// 
-			this.UserName0.DataPropertyName = "UserName";
-			this.UserName0.HeaderText = "校验者";
-			this.UserName0.Name = "UserName0";
-			this.UserName0.ReadOnly = true;
-			this.UserName0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.UserName0.Width = 70;
-			// 
-			// CreateTime0
-			// 
-			this.CreateTime0.DataPropertyName = "CreateTime";
-			dataGridViewCellStyle7.Format = "yyyy-MM-dd HH:mm:ss";
-			this.CreateTime0.DefaultCellStyle = dataGridViewCellStyle7;
-			this.CreateTime0.HeaderText = "校验漏扫时间";
-			this.CreateTime0.Name = "CreateTime0";
-			this.CreateTime0.ReadOnly = true;
-			this.CreateTime0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.CreateTime0.Width = 120;
-			// 
-			// OrganizationID
-			// 
-			this.OrganizationID.DataPropertyName = "OrganizationID";
-			this.OrganizationID.HeaderText = "漏扫工序所在的组织机构ID";
-			this.OrganizationID.Name = "OrganizationID";
-			this.OrganizationID.ReadOnly = true;
-			this.OrganizationID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.OrganizationID.Visible = false;
-			// 
-			// OrganizationCode
-			// 
-			this.OrganizationCode.DataPropertyName = "OrganizationCode";
-			this.OrganizationCode.HeaderText = "组织机构编码";
-			this.OrganizationCode.Name = "OrganizationCode";
-			this.OrganizationCode.ReadOnly = true;
-			this.OrganizationCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.OrganizationCode.Visible = false;
-			// 
-			// OrganizationFullName
-			// 
-			this.OrganizationFullName.DataPropertyName = "OrganizationFullName";
-			this.OrganizationFullName.HeaderText = "组织机构全称";
-			this.OrganizationFullName.Name = "OrganizationFullName";
-			this.OrganizationFullName.ReadOnly = true;
-			this.OrganizationFullName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.OrganizationFullName.Visible = false;
-			// 
-			// MissUserCode
-			// 
-			this.MissUserCode.DataPropertyName = "MissUserCode";
-			this.MissUserCode.HeaderText = "漏扫工号";
-			this.MissUserCode.Name = "MissUserCode";
-			this.MissUserCode.ReadOnly = true;
-			this.MissUserCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// repaircode
-			// 
-			this.repaircode.DataPropertyName = "repaircode";
-			this.repaircode.HeaderText = "补扫操作工号";
-			this.repaircode.Name = "repaircode";
-			this.repaircode.ReadOnly = true;
-			this.repaircode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// prepaircode
-			// 
-			this.prepaircode.DataPropertyName = "prepaircode";
-			this.prepaircode.HeaderText = "补扫生产工号";
-			this.prepaircode.Name = "prepaircode";
-			this.prepaircode.ReadOnly = true;
-			this.prepaircode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// OrganizationName
-			// 
-			this.OrganizationName.DataPropertyName = "OrganizationName";
-			this.OrganizationName.HeaderText = "漏扫部门";
-			this.OrganizationName.Name = "OrganizationName";
-			this.OrganizationName.ReadOnly = true;
-			this.OrganizationName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			this.OrganizationName.Width = 70;
-			// 
-			// barcodecount
-			// 
-			this.barcodecount.DataPropertyName = "barcodecount";
-			this.barcodecount.HeaderText = "数量";
-			this.barcodecount.Name = "barcodecount";
-			this.barcodecount.ReadOnly = true;
-			this.barcodecount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-			// 
-			// scbGoods
-			// 
-			this.scbGoods.CheckedData = null;
-			this.scbGoods.Location = new System.Drawing.Point(519, 20);
-			this.scbGoods.MultiSelect = true;
-			this.scbGoods.Name = "scbGoods";
-			this.scbGoods.Size = new System.Drawing.Size(133, 21);
-			this.scbGoods.TabIndex = 53;
-			// 
-			// lblGoods
-			// 
-			this.lblGoods.AutoSize = true;
-			this.lblGoods.BackColor = System.Drawing.Color.Transparent;
-			this.lblGoods.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblGoods.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblGoods.Location = new System.Drawing.Point(460, 26);
-			this.lblGoods.Name = "lblGoods";
-			this.lblGoods.Size = new System.Drawing.Size(53, 12);
-			this.lblGoods.TabIndex = 52;
-			this.lblGoods.Text = "产品名称";
-			// 
-			// F_RPT_010201_1
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1131, 481);
-			this.Controls.Add(this.dgvReportModule);
-			this.Controls.Add(this.gbxCondition);
-			this.Controls.Add(this.tsrOperate);
-			this.Name = "F_RPT_010201_1";
-			this.RightToLeftLayout = true;
-			this.Text = "工序漏扫明细表";
-			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010201_1_FormClosed);
-			this.Load += new System.EventHandler(this.F_RPT_010201_1_Load);
-			this.tsrOperate.ResumeLayout(false);
-			this.tsrOperate.PerformLayout();
-			this.gbxCondition.ResumeLayout(false);
-			this.gbxCondition.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).EndInit();
-			this.ResumeLayout(false);
+            this.dgvReportModule.ColumnTreeView = null;
+            this.dgvReportModule.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.dgvReportModule.DynamicColumnName = "";
+            this.dgvReportModule.EnableHeadersVisualStyles = false;
+            this.dgvReportModule.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvReportModule.FormatQuantityColumns = null;
+            this.dgvReportModule.HorizontalMergeColumn = null;
+            this.dgvReportModule.IsAutoCountSum = true;
+            this.dgvReportModule.IsAutoResizeColumns = false;
+            this.dgvReportModule.IsClickF12 = false;
+            this.dgvReportModule.IsOpenMergeCellFlag = false;
+            this.dgvReportModule.IsSubTotalFlag = false;
+            this.dgvReportModule.IsTopDeep = false;
+            this.dgvReportModule.Location = new System.Drawing.Point(0, 156);
+            this.dgvReportModule.Margin = new System.Windows.Forms.Padding(4);
+            this.dgvReportModule.MergeColumnNames = null;
+            this.dgvReportModule.MergeDetailColumnNames = null;
+            this.dgvReportModule.MergeDetailOnlyColumn = null;
+            this.dgvReportModule.MergeOnlyColumn = null;
+            this.dgvReportModule.MultiSelect = false;
+            this.dgvReportModule.Name = "dgvReportModule";
+            this.dgvReportModule.ReadOnly = true;
+            this.dgvReportModule.RefreshAtHscroll = false;
+            this.dgvReportModule.RowHeadersWidth = 50;
+            this.dgvReportModule.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvReportModule.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            this.dgvReportModule.RowTemplate.Height = 21;
+            this.dgvReportModule.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvReportModule.Size = new System.Drawing.Size(1492, 445);
+            this.dgvReportModule.SortOrderColumnName = null;
+            this.dgvReportModule.TabIndex = 28;
+            this.dgvReportModule.Tag = true;
+            this.dgvReportModule.TotalSumColumns = null;
+            this.dgvReportModule.ViewRowFilter = "";
+            // 
+            // MissID
+            // 
+            this.MissID.DataPropertyName = "MissID";
+            this.MissID.HeaderText = "漏扫ID";
+            this.MissID.MinimumWidth = 6;
+            this.MissID.Name = "MissID";
+            this.MissID.ReadOnly = true;
+            this.MissID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MissID.Visible = false;
+            this.MissID.Width = 125;
+            // 
+            // BarCode
+            // 
+            this.BarCode.DataPropertyName = "BarCode";
+            this.BarCode.HeaderText = "产品条码";
+            this.BarCode.MinimumWidth = 6;
+            this.BarCode.Name = "BarCode";
+            this.BarCode.ReadOnly = true;
+            this.BarCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.BarCode.Width = 90;
+            // 
+            // LogoCodeName
+            // 
+            this.LogoCodeName.DataPropertyName = "LogoCodeName";
+            this.LogoCodeName.HeaderText = "商标";
+            this.LogoCodeName.MinimumWidth = 6;
+            this.LogoCodeName.Name = "LogoCodeName";
+            this.LogoCodeName.ReadOnly = true;
+            this.LogoCodeName.Width = 125;
+            // 
+            // GoodsType
+            // 
+            this.GoodsType.DataPropertyName = "GoodsType";
+            this.GoodsType.HeaderText = "产品大类";
+            this.GoodsType.MinimumWidth = 6;
+            this.GoodsType.Name = "GoodsType";
+            this.GoodsType.ReadOnly = true;
+            this.GoodsType.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsType.Width = 125;
+            // 
+            // GoodsTypeName
+            // 
+            this.GoodsTypeName.DataPropertyName = "GoodsTypeName";
+            this.GoodsTypeName.HeaderText = "产品类别";
+            this.GoodsTypeName.MinimumWidth = 6;
+            this.GoodsTypeName.Name = "GoodsTypeName";
+            this.GoodsTypeName.ReadOnly = true;
+            this.GoodsTypeName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsTypeName.Visible = false;
+            this.GoodsTypeName.Width = 125;
+            // 
+            // GoodsID
+            // 
+            this.GoodsID.DataPropertyName = "GoodsID";
+            this.GoodsID.HeaderText = "产品ID";
+            this.GoodsID.MinimumWidth = 6;
+            this.GoodsID.Name = "GoodsID";
+            this.GoodsID.ReadOnly = true;
+            this.GoodsID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsID.Visible = false;
+            this.GoodsID.Width = 125;
+            // 
+            // GoodsCode
+            // 
+            this.GoodsCode.DataPropertyName = "GoodsCode";
+            this.GoodsCode.HeaderText = "产品编码";
+            this.GoodsCode.MinimumWidth = 6;
+            this.GoodsCode.Name = "GoodsCode";
+            this.GoodsCode.ReadOnly = true;
+            this.GoodsCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsCode.Width = 70;
+            // 
+            // GoodsName
+            // 
+            this.GoodsName.DataPropertyName = "GoodsName";
+            this.GoodsName.HeaderText = "产品名称";
+            this.GoodsName.MinimumWidth = 6;
+            this.GoodsName.Name = "GoodsName";
+            this.GoodsName.ReadOnly = true;
+            this.GoodsName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.GoodsName.Width = 125;
+            // 
+            // MissProcedureID
+            // 
+            this.MissProcedureID.DataPropertyName = "MissProcedureID";
+            this.MissProcedureID.HeaderText = "漏扫工序ID";
+            this.MissProcedureID.MinimumWidth = 6;
+            this.MissProcedureID.Name = "MissProcedureID";
+            this.MissProcedureID.ReadOnly = true;
+            this.MissProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MissProcedureID.Visible = false;
+            this.MissProcedureID.Width = 125;
+            // 
+            // MissProcedureCode
+            // 
+            this.MissProcedureCode.DataPropertyName = "MissProcedureCode";
+            this.MissProcedureCode.HeaderText = "漏扫工序编码";
+            this.MissProcedureCode.MinimumWidth = 6;
+            this.MissProcedureCode.Name = "MissProcedureCode";
+            this.MissProcedureCode.ReadOnly = true;
+            this.MissProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MissProcedureCode.Visible = false;
+            this.MissProcedureCode.Width = 125;
+            // 
+            // MissProcedureName
+            // 
+            this.MissProcedureName.DataPropertyName = "MissProcedureName";
+            this.MissProcedureName.HeaderText = "漏扫工序";
+            this.MissProcedureName.MinimumWidth = 6;
+            this.MissProcedureName.Name = "MissProcedureName";
+            this.MissProcedureName.ReadOnly = true;
+            this.MissProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MissProcedureName.Width = 125;
+            // 
+            // CompleteProcedureID
+            // 
+            this.CompleteProcedureID.DataPropertyName = "CompleteProcedureID";
+            this.CompleteProcedureID.HeaderText = "完成工序ID";
+            this.CompleteProcedureID.MinimumWidth = 6;
+            this.CompleteProcedureID.Name = "CompleteProcedureID";
+            this.CompleteProcedureID.ReadOnly = true;
+            this.CompleteProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CompleteProcedureID.Visible = false;
+            this.CompleteProcedureID.Width = 125;
+            // 
+            // CompleteProcedureCode
+            // 
+            this.CompleteProcedureCode.DataPropertyName = "CompleteProcedureCode";
+            this.CompleteProcedureCode.HeaderText = "完成工序编码";
+            this.CompleteProcedureCode.MinimumWidth = 6;
+            this.CompleteProcedureCode.Name = "CompleteProcedureCode";
+            this.CompleteProcedureCode.ReadOnly = true;
+            this.CompleteProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CompleteProcedureCode.Visible = false;
+            this.CompleteProcedureCode.Width = 125;
+            // 
+            // CompleteProcedureName
+            // 
+            this.CompleteProcedureName.DataPropertyName = "CompleteProcedureName";
+            this.CompleteProcedureName.HeaderText = "完成工序";
+            this.CompleteProcedureName.MinimumWidth = 6;
+            this.CompleteProcedureName.Name = "CompleteProcedureName";
+            this.CompleteProcedureName.ReadOnly = true;
+            this.CompleteProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CompleteProcedureName.Width = 125;
+            // 
+            // ProcedureID
+            // 
+            this.ProcedureID.DataPropertyName = "ProcedureID";
+            this.ProcedureID.HeaderText = "校验工序ID";
+            this.ProcedureID.MinimumWidth = 6;
+            this.ProcedureID.Name = "ProcedureID";
+            this.ProcedureID.ReadOnly = true;
+            this.ProcedureID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ProcedureID.Visible = false;
+            this.ProcedureID.Width = 125;
+            // 
+            // ProcedureCode
+            // 
+            this.ProcedureCode.DataPropertyName = "ProcedureCode";
+            this.ProcedureCode.HeaderText = "校验工序编码";
+            this.ProcedureCode.MinimumWidth = 6;
+            this.ProcedureCode.Name = "ProcedureCode";
+            this.ProcedureCode.ReadOnly = true;
+            this.ProcedureCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ProcedureCode.Visible = false;
+            this.ProcedureCode.Width = 125;
+            // 
+            // ProcedureName
+            // 
+            this.ProcedureName.DataPropertyName = "ProcedureName";
+            this.ProcedureName.HeaderText = "校验工序";
+            this.ProcedureName.MinimumWidth = 6;
+            this.ProcedureName.Name = "ProcedureName";
+            this.ProcedureName.ReadOnly = true;
+            this.ProcedureName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ProcedureName.Width = 125;
+            // 
+            // UserName0
+            // 
+            this.UserName0.DataPropertyName = "UserName";
+            this.UserName0.HeaderText = "校验者";
+            this.UserName0.MinimumWidth = 6;
+            this.UserName0.Name = "UserName0";
+            this.UserName0.ReadOnly = true;
+            this.UserName0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.UserName0.Width = 70;
+            // 
+            // CreateTime0
+            // 
+            this.CreateTime0.DataPropertyName = "CreateTime";
+            dataGridViewCellStyle3.Format = "yyyy-MM-dd HH:mm:ss";
+            this.CreateTime0.DefaultCellStyle = dataGridViewCellStyle3;
+            this.CreateTime0.HeaderText = "校验漏扫时间";
+            this.CreateTime0.MinimumWidth = 6;
+            this.CreateTime0.Name = "CreateTime0";
+            this.CreateTime0.ReadOnly = true;
+            this.CreateTime0.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CreateTime0.Width = 120;
+            // 
+            // OrganizationID
+            // 
+            this.OrganizationID.DataPropertyName = "OrganizationID";
+            this.OrganizationID.HeaderText = "漏扫工序所在的组织机构ID";
+            this.OrganizationID.MinimumWidth = 6;
+            this.OrganizationID.Name = "OrganizationID";
+            this.OrganizationID.ReadOnly = true;
+            this.OrganizationID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.OrganizationID.Visible = false;
+            this.OrganizationID.Width = 125;
+            // 
+            // OrganizationCode
+            // 
+            this.OrganizationCode.DataPropertyName = "OrganizationCode";
+            this.OrganizationCode.HeaderText = "组织机构编码";
+            this.OrganizationCode.MinimumWidth = 6;
+            this.OrganizationCode.Name = "OrganizationCode";
+            this.OrganizationCode.ReadOnly = true;
+            this.OrganizationCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.OrganizationCode.Visible = false;
+            this.OrganizationCode.Width = 125;
+            // 
+            // OrganizationFullName
+            // 
+            this.OrganizationFullName.DataPropertyName = "OrganizationFullName";
+            this.OrganizationFullName.HeaderText = "组织机构全称";
+            this.OrganizationFullName.MinimumWidth = 6;
+            this.OrganizationFullName.Name = "OrganizationFullName";
+            this.OrganizationFullName.ReadOnly = true;
+            this.OrganizationFullName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.OrganizationFullName.Visible = false;
+            this.OrganizationFullName.Width = 125;
+            // 
+            // MissUserCode
+            // 
+            this.MissUserCode.DataPropertyName = "MissUserCode";
+            this.MissUserCode.HeaderText = "漏扫工号";
+            this.MissUserCode.MinimumWidth = 6;
+            this.MissUserCode.Name = "MissUserCode";
+            this.MissUserCode.ReadOnly = true;
+            this.MissUserCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MissUserCode.Width = 125;
+            // 
+            // repaircode
+            // 
+            this.repaircode.DataPropertyName = "repaircode";
+            this.repaircode.HeaderText = "补扫操作工号";
+            this.repaircode.MinimumWidth = 6;
+            this.repaircode.Name = "repaircode";
+            this.repaircode.ReadOnly = true;
+            this.repaircode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.repaircode.Width = 125;
+            // 
+            // prepaircode
+            // 
+            this.prepaircode.DataPropertyName = "prepaircode";
+            this.prepaircode.HeaderText = "补扫生产工号";
+            this.prepaircode.MinimumWidth = 6;
+            this.prepaircode.Name = "prepaircode";
+            this.prepaircode.ReadOnly = true;
+            this.prepaircode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.prepaircode.Width = 125;
+            // 
+            // OrganizationName
+            // 
+            this.OrganizationName.DataPropertyName = "OrganizationName";
+            this.OrganizationName.HeaderText = "漏扫部门";
+            this.OrganizationName.MinimumWidth = 6;
+            this.OrganizationName.Name = "OrganizationName";
+            this.OrganizationName.ReadOnly = true;
+            this.OrganizationName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.OrganizationName.Width = 70;
+            // 
+            // barcodecount
+            // 
+            this.barcodecount.DataPropertyName = "barcodecount";
+            this.barcodecount.HeaderText = "数量";
+            this.barcodecount.MinimumWidth = 6;
+            this.barcodecount.Name = "barcodecount";
+            this.barcodecount.ReadOnly = true;
+            this.barcodecount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.barcodecount.Width = 125;
+            // 
+            // F_RPT_010201_1
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1508, 601);
+            this.Controls.Add(this.dgvReportModule);
+            this.Controls.Add(this.gbxCondition);
+            this.Controls.Add(this.tsrOperate);
+            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Name = "F_RPT_010201_1";
+            this.RightToLeftLayout = true;
+            this.Text = "工序漏扫明细表";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_010201_1_FormClosed);
+            this.Load += new System.EventHandler(this.F_RPT_010201_1_Load);
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            this.gbxCondition.ResumeLayout(false);
+            this.gbxCondition.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvReportModule)).EndInit();
+            this.ResumeLayout(false);
 
         }
 

+ 1 - 1
DK.Client/ReportModule/R01/M02/F_RPT_010201_1.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnMissed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc

+ 2 - 2
WCF.Service/WCF.Hosting/Config.ini

@@ -18,8 +18,8 @@ ServerName=Debug
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.2.20.1014
-ClientVersion=1.2.20.1014
+AndroidVersion=1.2.20.1130
+ClientVersion=1.2.20.1130
 
 [PathSetting]
 ;客户端升级,下载文件路径

+ 2 - 2
WCF.Service/WCF.WebHosting/Config.ini

@@ -19,8 +19,8 @@ GOURL=http://172.18.32.35:9000/mes/mesgo.ashx
 
 [VersionSetting]
 PublicClientVersion=1.0.0.6
-AndroidVersion=1.0.20.1014
-ClientVersion=1.2.20.1014
+AndroidVersion=1.0.20.1130
+ClientVersion=1.2.20.1130
 
 [PathSetting]
 ;客户端升级,下载文件路径