工艺（成品、半成品）质量报表

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

@@ -29,17 +29,17 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040113));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = 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();
@@ -48,7 +48,13 @@
             this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.dropKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
+            this.lblKilnCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.cmbGoodsType2 = new Dongke.WinForm.Controls.CmbComboBox();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.dgvRpt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.g1pcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -67,8 +73,6 @@
             this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.defectcount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cmbGoodsType2 = new Dongke.WinForm.Controls.CmbComboBox();
-            this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.tsrOperate.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).BeginInit();
@@ -91,7 +95,7 @@
             this.tsrOperate.Name = "tsrOperate";
             this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
             this.tsrOperate.ShowItemToolTips = false;
-            this.tsrOperate.Size = new System.Drawing.Size(824, 35);
+            this.tsrOperate.Size = new System.Drawing.Size(1002, 35);
             this.tsrOperate.TabIndex = 36;
             this.tsrOperate.Text = "toolStrip1";
             // 
@@ -147,7 +151,7 @@
             this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
             this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-            this.btnClearCondition.Location = new System.Drawing.Point(721, 20);
+            this.btnClearCondition.Location = new System.Drawing.Point(899, 20);
             this.btnClearCondition.Name = "btnClearCondition";
             this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
             this.btnClearCondition.TabIndex = 13;
@@ -162,7 +166,7 @@
             this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
             this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSearch.ForeColor = System.Drawing.Color.White;
-            this.btnSearch.Location = new System.Drawing.Point(630, 20);
+            this.btnSearch.Location = new System.Drawing.Point(808, 20);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(85, 30);
             this.btnSearch.TabIndex = 12;
@@ -176,6 +180,10 @@
             | 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.dropKilnCode);
+            this.gbxCondition.Controls.Add(this.lblKilnCode);
+            this.gbxCondition.Controls.Add(this.scbGoods);
+            this.gbxCondition.Controls.Add(this.lblGoods);
             this.gbxCondition.Controls.Add(this.cmbGoodsType2);
             this.gbxCondition.Controls.Add(this.c_Label1);
             this.gbxCondition.Controls.Add(this.c_Label2);
@@ -190,11 +198,68 @@
             this.gbxCondition.Location = new System.Drawing.Point(0, 38);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.OriginalHeight = -1;
-            this.gbxCondition.Size = new System.Drawing.Size(812, 59);
+            this.gbxCondition.Size = new System.Drawing.Size(990, 59);
             this.gbxCondition.TabIndex = 37;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件 ▼";
             // 
+            // dropKilnCode
+            // 
+            this.dropKilnCode.BackColor = System.Drawing.SystemColors.Window;
+            this.dropKilnCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.dropKilnCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.dropKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dropKilnCode.FormattingEnabled = true;
+            this.dropKilnCode.Location = new System.Drawing.Point(729, 21);
+            this.dropKilnCode.Name = "dropKilnCode";
+            this.dropKilnCode.Size = new System.Drawing.Size(73, 20);
+            this.dropKilnCode.TabIndex = 17;
+            // 
+            // lblKilnCode
+            // 
+            this.lblKilnCode.AutoSize = true;
+            this.lblKilnCode.BackColor = System.Drawing.SystemColors.Control;
+            this.lblKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblKilnCode.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblKilnCode.Location = new System.Drawing.Point(670, 25);
+            this.lblKilnCode.Name = "lblKilnCode";
+            this.lblKilnCode.Size = new System.Drawing.Size(53, 12);
+            this.lblKilnCode.TabIndex = 18;
+            this.lblKilnCode.Text = "窑炉编号";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.Location = new System.Drawing.Point(544, 21);
+            this.scbGoods.MultiSelect = true;
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(120, 21);
+            this.scbGoods.TabIndex = 16;
+            // 
+            // 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(485, 25);
+            this.lblGoods.Name = "lblGoods";
+            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.TabIndex = 15;
+            this.lblGoods.Text = "产品编码";
+            // 
+            // cmbGoodsType2
+            // 
+            this.cmbGoodsType2.FormattingEnabled = true;
+            this.cmbGoodsType2.Items.AddRange(new object[] {
+            "全部",
+            "大件",
+            "小件"});
+            this.cmbGoodsType2.Location = new System.Drawing.Point(360, 21);
+            this.cmbGoodsType2.Name = "cmbGoodsType2";
+            this.cmbGoodsType2.Size = new System.Drawing.Size(120, 20);
+            this.cmbGoodsType2.TabIndex = 14;
+            // 
             // c_Label1
             // 
             this.c_Label1.AutoSize = true;
@@ -208,6 +273,19 @@
             this.c_Label1.TabIndex = 7;
             this.c_Label1.Text = "-";
             // 
+            // c_Label2
+            // 
+            this.c_Label2.AutoSize = true;
+            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label2.Location = new System.Drawing.Point(301, 24);
+            this.c_Label2.Name = "c_Label2";
+            this.c_Label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.c_Label2.Size = new System.Drawing.Size(53, 12);
+            this.c_Label2.TabIndex = 7;
+            this.c_Label2.Text = "产品类型";
+            // 
             // dtpAccountDateEnd
             // 
             this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
@@ -225,8 +303,8 @@
             this.dgvRpt.AllowUserToModifyRows = true;
             this.dgvRpt.AllowUserToOrderColumns = true;
             this.dgvRpt.AllowUserToSortRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvRpt.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvRpt.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle34;
             this.dgvRpt.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvRpt.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvRpt.CellHeight = 23;
@@ -234,14 +312,14 @@
             this.dgvRpt.ChildNodeColumnText = null;
             this.dgvRpt.ColumnDeep = 1;
             this.dgvRpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRpt.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle35.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvRpt.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle35;
             this.dgvRpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvRpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.g1pcode,
@@ -277,8 +355,8 @@
             this.dgvRpt.RefreshAtHscroll = false;
             this.dgvRpt.RowHeadersWidth = 50;
             this.dgvRpt.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvRpt.RowsDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle40.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvRpt.RowsDefaultCellStyle = dataGridViewCellStyle40;
             this.dgvRpt.RowTemplate.Height = 21;
             this.dgvRpt.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvRpt.Size = new System.Drawing.Size(500, 372);
@@ -324,9 +402,9 @@
             // OutKilnCount
             // 
             this.OutKilnCount.DataPropertyName = "outkcount";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.Format = "N0";
-            this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle36.Format = "N0";
+            this.OutKilnCount.DefaultCellStyle = dataGridViewCellStyle36;
             this.OutKilnCount.HeaderText = "出窑数";
             this.OutKilnCount.Name = "OutKilnCount";
             this.OutKilnCount.ReadOnly = true;
@@ -335,9 +413,9 @@
             // Qualified
             // 
             this.Qualified.DataPropertyName = "cc";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Format = "N0";
-            this.Qualified.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle37.Format = "N0";
+            this.Qualified.DefaultCellStyle = dataGridViewCellStyle37;
             this.Qualified.HeaderText = "合格数";
             this.Qualified.Name = "Qualified";
             this.Qualified.ReadOnly = true;
@@ -346,9 +424,9 @@
             // g1defectcount
             // 
             this.g1defectcount.DataPropertyName = "defectcount";
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle5.Format = "N0";
-            this.g1defectcount.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle38.Format = "N0";
+            this.g1defectcount.DefaultCellStyle = dataGridViewCellStyle38;
             this.g1defectcount.HeaderText = "次品数";
             this.g1defectcount.Name = "g1defectcount";
             this.g1defectcount.ReadOnly = true;
@@ -357,10 +435,10 @@
             // g1ccp
             // 
             this.g1ccp.DataPropertyName = "ccp";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle6.Format = "P2";
-            dataGridViewCellStyle6.NullValue = "#DIV/0!";
-            this.g1ccp.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle39.Format = "P2";
+            dataGridViewCellStyle39.NullValue = "#DIV/0!";
+            this.g1ccp.DefaultCellStyle = dataGridViewCellStyle39;
             this.g1ccp.HeaderText = "合格率";
             this.g1ccp.Name = "g1ccp";
             this.g1ccp.ReadOnly = true;
@@ -382,7 +460,7 @@
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.dgvD);
-            this.splitContainer1.Size = new System.Drawing.Size(812, 372);
+            this.splitContainer1.Size = new System.Drawing.Size(990, 372);
             this.splitContainer1.SplitterDistance = 500;
             this.splitContainer1.TabIndex = 38;
             // 
@@ -393,8 +471,8 @@
             this.dgvD.AllowUserToModifyRows = true;
             this.dgvD.AllowUserToOrderColumns = true;
             this.dgvD.AllowUserToSortRows = false;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle41.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle41;
             this.dgvD.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.dgvD.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
             this.dgvD.CellHeight = 23;
@@ -402,14 +480,14 @@
             this.dgvD.ChildNodeColumnText = null;
             this.dgvD.ColumnDeep = 1;
             this.dgvD.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle42.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle42;
             this.dgvD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.g2pcode,
@@ -443,11 +521,11 @@
             this.dgvD.RefreshAtHscroll = false;
             this.dgvD.RowHeadersWidth = 50;
             this.dgvD.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvD.RowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle44.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvD.RowsDefaultCellStyle = dataGridViewCellStyle44;
             this.dgvD.RowTemplate.Height = 21;
             this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvD.Size = new System.Drawing.Size(308, 372);
+            this.dgvD.Size = new System.Drawing.Size(486, 372);
             this.dgvD.SortOrderColumnName = null;
             this.dgvD.TabIndex = 29;
             this.dgvD.Tag = true;
@@ -495,48 +573,23 @@
             // defectcount
             // 
             this.defectcount.DataPropertyName = "defectcount";
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle10.Format = "N0";
-            this.defectcount.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle43.Format = "N0";
+            this.defectcount.DefaultCellStyle = dataGridViewCellStyle43;
             this.defectcount.HeaderText = "缺陷数";
             this.defectcount.Name = "defectcount";
             this.defectcount.ReadOnly = true;
             // 
-            // cmbGoodsType2
-            // 
-            this.cmbGoodsType2.FormattingEnabled = true;
-            this.cmbGoodsType2.Items.AddRange(new object[] {
-            "全部",
-            "大件",
-            "小件"});
-            this.cmbGoodsType2.Location = new System.Drawing.Point(360, 21);
-            this.cmbGoodsType2.Name = "cmbGoodsType2";
-            this.cmbGoodsType2.Size = new System.Drawing.Size(120, 20);
-            this.cmbGoodsType2.TabIndex = 14;
-            // 
-            // c_Label2
-            // 
-            this.c_Label2.AutoSize = true;
-            this.c_Label2.BackColor = System.Drawing.Color.Transparent;
-            this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label2.Location = new System.Drawing.Point(301, 24);
-            this.c_Label2.Name = "c_Label2";
-            this.c_Label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.c_Label2.Size = new System.Drawing.Size(53, 12);
-            this.c_Label2.TabIndex = 7;
-            this.c_Label2.Text = "产品类型";
-            // 
             // F_RPT_040113
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(824, 476);
+            this.ClientSize = new System.Drawing.Size(1002, 476);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.tsrOperate);
             this.Controls.Add(this.gbxCondition);
             this.Name = "F_RPT_040113";
-            this.Text = "各工艺质量表";
+            this.Text = "成品工艺质量表";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040113_FormClosed);
             this.Load += new System.EventHandler(this.F_RPT_040113_Load);
             this.tsrOperate.ResumeLayout(false);
@@ -583,5 +636,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn g1ccp;
         private WinForm.Controls.CmbComboBox cmbGoodsType2;
         private Basics.BaseControls.C_Label c_Label2;
+        private Controls.SearchBox.ScbGoods scbGoods;
+        private Basics.BaseControls.C_Label lblGoods;
+        private Basics.BaseControls.C_ComboBox dropKilnCode;
+        private Basics.BaseControls.C_Label lblKilnCode;
     }
 }

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

@@ -3,13 +3,14 @@
  * Copyright(c) 2015 DongkeSoft All rights reserved. / Confidential
  * 类的信息：
  *      1.程序名称：F_RPT_040113.cs
- *      2.功能描述：各工艺质量表
+ *      2.功能描述：成品工艺质量表
  * 编辑履历：
  *      作者            日期                版本            修改内容
  *      陈晓野          2019/07/16          1.00            新建
  *******************************************************************************/
 
 using System;
+using System.Data;
 using System.Windows.Forms;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;
@@ -22,7 +23,7 @@ using Dongke.IBOSS.PRD.WCF.Proxys;
 namespace Dongke.IBOSS.PRD.Client.ReportModule
 {
     /// <summary>
-    /// 各工序质量表
+    /// 成品工艺质量表
     /// </summary>
     public partial class F_RPT_040113 : DKDockPanelBase
 	{
@@ -42,7 +43,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		{
 			InitializeComponent();
 			// 窗体显示的Title
-			this.Text = "各工艺质量表";
+			this.Text = "成品工艺质量表";
 			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
 			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
 			this.btnSearch.Text = ButtonText.BTN_SEARCH;
@@ -94,6 +95,22 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 				this.dtpAccountDateStart.Value = DateTime.Now.Date;
                 this.dtpAccountDateEnd.Value = DateTime.Now.Date;
                 this.cmbGoodsType2.SelectedIndex = 0;
+
+
+                //绑定窑炉下来列表
+                byte byFlage = Convert.ToByte(Constant.ValueFlag.Invalid);
+                DataTable dtKilnInfo = ReportModuleProxy.Service.GetKilnData(byFlage).Data.Tables[Constant.INT_IS_ZERO];
+
+                dtKilnInfo.DefaultView.RowFilter = "KilnCode not like 'S%'";
+
+                //DataTable dtKilnInfo = sre2.Data.Tables[Constant.INT_IS_ZERO];
+                DataRow newRowDic = dtKilnInfo.NewRow();
+                newRowDic["KilnID"] = Constant.CBO_SELECT_ALL_VALUE;
+                newRowDic["KilnCode"] = Constant.CBO_SELECT_ALL_NAME;
+                dtKilnInfo.Rows.InsertAt(newRowDic, Constant.INT_IS_ZERO);
+                this.dropKilnCode.DataSource = dtKilnInfo;
+                this.dropKilnCode.ValueMember = "KilnID";
+                this.dropKilnCode.DisplayMember = "KilnCode";
             }
 			catch (Exception ex)
 			{
@@ -166,6 +183,11 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 {
                     _cre.Properties["gtcode2"] = "[ALL]";
                 }
+                _cre.Properties["GoodsIDS"] = scbGoods.CheckedPKMember;
+                if (!this.dropKilnCode.Text.Equals(Constant.CBO_SELECT_ALL_NAME))
+                {
+                    _cre.Properties["KilnID"] = Convert.ToInt32(this.dropKilnCode.SelectedValue);
+                }
 
                 ServiceResultEntity resultEntity = DoAsync<ServiceResultEntity>(() =>
                 {
@@ -206,6 +228,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dtpAccountDateStart.Value = DateTime.Now.Date;
             this.dtpAccountDateEnd.Value = DateTime.Now.Date;
             this.cmbGoodsType2.SelectedIndex = 0;
+            this.dropKilnCode.SelectedIndex = 0;
+            this.scbGoods.ClearValue();
         }
 
         private void dgvRpt_SelectionChanged(object sender, EventArgs e)
@@ -230,6 +254,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 {
                     cre.Properties["timebegin"] = _cre.Properties["timebegin"];
                     cre.Properties["timeend"] = _cre.Properties["timeend"];
+                    cre.Properties["GoodsIDS"] = _cre.Properties["GoodsIDS"];
+                    cre.Properties["KilnID"] = _cre.Properties["KilnID"];
                 }
                 else
                 {

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

@@ -0,0 +1,628 @@
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+    partial class F_RPT_040115
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_RPT_040115));
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+            this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+            this.lblAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpAccountDateStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+            this.scbGoods = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+            this.lblGoods = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.dtpAccountDateEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.dgvRpt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.dgvD = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.g1PROCEDUREID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1gtcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g1goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PCOUNT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HEGE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BUHEGE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.FANGONG = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HEGELV = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.g2PROCEDURENAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DEFECTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DCOUNT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tsrOperate.SuspendLayout();
+            this.gbxCondition.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // tsrOperate
+            // 
+            this.tsrOperate.AutoSize = false;
+            this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+            this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+            this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+            this.tsrOperate.Name = "tsrOperate";
+            this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+            this.tsrOperate.ShowItemToolTips = false;
+            this.tsrOperate.Size = new System.Drawing.Size(1002, 35);
+            this.tsrOperate.TabIndex = 36;
+            this.tsrOperate.Text = "toolStrip1";
+            // 
+            // tsbtnAdaptive
+            // 
+            this.tsbtnAdaptive.AutoSize = false;
+            this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+            this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+            this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+            this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+            // 
+            // tsbtnClose
+            // 
+            this.tsbtnClose.AutoSize = false;
+            this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnClose.Name = "tsbtnClose";
+            this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+            this.tsbtnClose.Text = "关闭(&X)";
+            this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+            // 
+            // lblAccountDateStart
+            // 
+            this.lblAccountDateStart.AutoSize = true;
+            this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
+            this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblAccountDateStart.Location = new System.Drawing.Point(37, 24);
+            this.lblAccountDateStart.Name = "lblAccountDateStart";
+            this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.lblAccountDateStart.Size = new System.Drawing.Size(29, 12);
+            this.lblAccountDateStart.TabIndex = 7;
+            this.lblAccountDateStart.Text = "日期";
+            // 
+            // dtpAccountDateStart
+            // 
+            this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd";
+            this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpAccountDateStart.Location = new System.Drawing.Point(72, 20);
+            this.dtpAccountDateStart.Name = "dtpAccountDateStart";
+            this.dtpAccountDateStart.Size = new System.Drawing.Size(100, 21);
+            this.dtpAccountDateStart.TabIndex = 1;
+            // 
+            // btnClearCondition
+            // 
+            this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClearCondition.BackColor = System.Drawing.Color.Transparent;
+            this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+            this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+            this.btnClearCondition.Location = new System.Drawing.Point(899, 20);
+            this.btnClearCondition.Name = "btnClearCondition";
+            this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+            this.btnClearCondition.TabIndex = 13;
+            this.btnClearCondition.Text = "清空条件(&C)";
+            this.btnClearCondition.UseVisualStyleBackColor = true;
+            this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(808, 20);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.TabIndex = 12;
+            this.btnSearch.Text = "查询(&Q)";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // gbxCondition
+            // 
+            this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | 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.lblGoodsType);
+            this.gbxCondition.Controls.Add(this.scbGoodsType);
+            this.gbxCondition.Controls.Add(this.dkProcedureSearchBox);
+            this.gbxCondition.Controls.Add(this.scbGoods);
+            this.gbxCondition.Controls.Add(this.lblGoods);
+            this.gbxCondition.Controls.Add(this.c_Label1);
+            this.gbxCondition.Controls.Add(this.lblAccountDateStart);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateEnd);
+            this.gbxCondition.Controls.Add(this.dtpAccountDateStart);
+            this.gbxCondition.Controls.Add(this.btnClearCondition);
+            this.gbxCondition.Controls.Add(this.btnSearch);
+            this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.gbxCondition.IsMustInput = false;
+            this.gbxCondition.Location = new System.Drawing.Point(0, 38);
+            this.gbxCondition.Name = "gbxCondition";
+            this.gbxCondition.OriginalHeight = -1;
+            this.gbxCondition.Size = new System.Drawing.Size(990, 59);
+            this.gbxCondition.TabIndex = 37;
+            this.gbxCondition.TabStop = false;
+            this.gbxCondition.Text = "查询条件 ▼";
+            // 
+            // scbGoods
+            // 
+            this.scbGoods.CheckedData = null;
+            this.scbGoods.Location = new System.Drawing.Point(544, 21);
+            this.scbGoods.MultiSelect = true;
+            this.scbGoods.Name = "scbGoods";
+            this.scbGoods.Size = new System.Drawing.Size(120, 21);
+            this.scbGoods.TabIndex = 16;
+            // 
+            // 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(485, 25);
+            this.lblGoods.Name = "lblGoods";
+            this.lblGoods.Size = new System.Drawing.Size(53, 12);
+            this.lblGoods.TabIndex = 15;
+            this.lblGoods.Text = "产品编码";
+            // 
+            // c_Label1
+            // 
+            this.c_Label1.AutoSize = true;
+            this.c_Label1.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.c_Label1.Location = new System.Drawing.Point(178, 24);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.c_Label1.Size = new System.Drawing.Size(11, 12);
+            this.c_Label1.TabIndex = 7;
+            this.c_Label1.Text = "-";
+            // 
+            // dtpAccountDateEnd
+            // 
+            this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd";
+            this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpAccountDateEnd.Location = new System.Drawing.Point(195, 20);
+            this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
+            this.dtpAccountDateEnd.Size = new System.Drawing.Size(100, 21);
+            this.dtpAccountDateEnd.TabIndex = 2;
+            // 
+            // dgvRpt
+            // 
+            this.dgvRpt.AllowUserToAddRows = false;
+            this.dgvRpt.AllowUserToDeleteRows = false;
+            this.dgvRpt.AllowUserToModifyRows = true;
+            this.dgvRpt.AllowUserToOrderColumns = true;
+            this.dgvRpt.AllowUserToSortRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvRpt.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvRpt.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvRpt.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvRpt.CellHeight = 23;
+            this.dgvRpt.ChildNodeColumnName = null;
+            this.dgvRpt.ChildNodeColumnText = null;
+            this.dgvRpt.ColumnDeep = 1;
+            this.dgvRpt.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvRpt.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvRpt.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvRpt.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.g1PROCEDUREID,
+            this.g1gtcode2,
+            this.g1PROCEDURENAME,
+            this.g1goodstypename,
+            this.PCOUNT,
+            this.HEGE,
+            this.BUHEGE,
+            this.FANGONG,
+            this.HEGELV});
+            this.dgvRpt.ColumnTreeView = null;
+            this.dgvRpt.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvRpt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvRpt.DynamicColumnName = "";
+            this.dgvRpt.EnableHeadersVisualStyles = false;
+            this.dgvRpt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvRpt.FormatQuantityColumns = null;
+            this.dgvRpt.HorizontalMergeColumn = null;
+            this.dgvRpt.IsAutoCountSum = true;
+            this.dgvRpt.IsAutoResizeColumns = false;
+            this.dgvRpt.IsClickF12 = false;
+            this.dgvRpt.IsOpenMergeCellFlag = false;
+            this.dgvRpt.IsSubTotalFlag = false;
+            this.dgvRpt.IsTopDeep = false;
+            this.dgvRpt.Location = new System.Drawing.Point(0, 0);
+            this.dgvRpt.MergeColumnNames = null;
+            this.dgvRpt.MergeDetailColumnNames = null;
+            this.dgvRpt.MergeDetailOnlyColumn = null;
+            this.dgvRpt.MergeOnlyColumn = null;
+            this.dgvRpt.MultiSelect = false;
+            this.dgvRpt.Name = "dgvRpt";
+            this.dgvRpt.ReadOnly = true;
+            this.dgvRpt.RefreshAtHscroll = false;
+            this.dgvRpt.RowHeadersWidth = 50;
+            this.dgvRpt.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvRpt.RowsDefaultCellStyle = dataGridViewCellStyle8;
+            this.dgvRpt.RowTemplate.Height = 21;
+            this.dgvRpt.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvRpt.Size = new System.Drawing.Size(601, 372);
+            this.dgvRpt.SortOrderColumnName = null;
+            this.dgvRpt.TabIndex = 28;
+            this.dgvRpt.Tag = true;
+            this.dgvRpt.TotalSumColumns = null;
+            this.dgvRpt.ViewRowFilter = "";
+            this.dgvRpt.SelectionChanged += new System.EventHandler(this.dgvRpt_SelectionChanged);
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 103);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.dgvRpt);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.dgvD);
+            this.splitContainer1.Size = new System.Drawing.Size(990, 372);
+            this.splitContainer1.SplitterDistance = 601;
+            this.splitContainer1.TabIndex = 38;
+            // 
+            // dgvD
+            // 
+            this.dgvD.AllowUserToAddRows = false;
+            this.dgvD.AllowUserToDeleteRows = false;
+            this.dgvD.AllowUserToModifyRows = true;
+            this.dgvD.AllowUserToOrderColumns = true;
+            this.dgvD.AllowUserToSortRows = false;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvD.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
+            this.dgvD.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.dgvD.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+            this.dgvD.CellHeight = 23;
+            this.dgvD.ChildNodeColumnName = null;
+            this.dgvD.ChildNodeColumnText = null;
+            this.dgvD.ColumnDeep = 1;
+            this.dgvD.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvD.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
+            this.dgvD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.g2PROCEDURENAME,
+            this.defectcode,
+            this.DEFECTNAME,
+            this.DCOUNT});
+            this.dgvD.ColumnTreeView = null;
+            this.dgvD.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
+            this.dgvD.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvD.DynamicColumnName = "";
+            this.dgvD.EnableHeadersVisualStyles = false;
+            this.dgvD.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvD.FormatQuantityColumns = null;
+            this.dgvD.HorizontalMergeColumn = null;
+            this.dgvD.IsAutoCountSum = true;
+            this.dgvD.IsAutoResizeColumns = false;
+            this.dgvD.IsClickF12 = false;
+            this.dgvD.IsOpenMergeCellFlag = false;
+            this.dgvD.IsSubTotalFlag = false;
+            this.dgvD.IsTopDeep = false;
+            this.dgvD.Location = new System.Drawing.Point(0, 0);
+            this.dgvD.MergeColumnNames = null;
+            this.dgvD.MergeDetailColumnNames = null;
+            this.dgvD.MergeDetailOnlyColumn = null;
+            this.dgvD.MergeOnlyColumn = null;
+            this.dgvD.MultiSelect = false;
+            this.dgvD.Name = "dgvD";
+            this.dgvD.ReadOnly = true;
+            this.dgvD.RefreshAtHscroll = false;
+            this.dgvD.RowHeadersWidth = 50;
+            this.dgvD.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvD.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            this.dgvD.RowTemplate.Height = 21;
+            this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvD.Size = new System.Drawing.Size(385, 372);
+            this.dgvD.SortOrderColumnName = null;
+            this.dgvD.TabIndex = 29;
+            this.dgvD.Tag = true;
+            this.dgvD.TotalSumColumns = null;
+            this.dgvD.ViewRowFilter = "";
+            // 
+            // 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(170, 21);
+            this.dkProcedureSearchBox.TabIndex = 17;
+            this.dkProcedureSearchBox.Title = "完成工序";
+            this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // 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(309, 25);
+            this.lblGoodsType.Name = "lblGoodsType";
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
+            this.lblGoodsType.TabIndex = 38;
+            this.lblGoodsType.Text = "产品类别";
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(368, 21);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(111, 21);
+            this.scbGoodsType.TabIndex = 37;
+            // 
+            // g1PROCEDUREID
+            // 
+            this.g1PROCEDUREID.DataPropertyName = "PROCEDUREID";
+            this.g1PROCEDUREID.HeaderText = "PROCEDUREID";
+            this.g1PROCEDUREID.Name = "g1PROCEDUREID";
+            this.g1PROCEDUREID.ReadOnly = true;
+            this.g1PROCEDUREID.Visible = false;
+            // 
+            // g1gtcode2
+            // 
+            this.g1gtcode2.DataPropertyName = "gtcode2";
+            this.g1gtcode2.HeaderText = "gtcode2";
+            this.g1gtcode2.Name = "g1gtcode2";
+            this.g1gtcode2.ReadOnly = true;
+            this.g1gtcode2.Visible = false;
+            // 
+            // g1PROCEDURENAME
+            // 
+            this.g1PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
+            this.g1PROCEDURENAME.HeaderText = "工序名称";
+            this.g1PROCEDURENAME.Name = "g1PROCEDURENAME";
+            this.g1PROCEDURENAME.ReadOnly = true;
+            this.g1PROCEDURENAME.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // g1goodstypename
+            // 
+            this.g1goodstypename.DataPropertyName = "goodstypename";
+            this.g1goodstypename.HeaderText = "类别";
+            this.g1goodstypename.Name = "g1goodstypename";
+            this.g1goodstypename.ReadOnly = true;
+            this.g1goodstypename.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.g1goodstypename.Visible = false;
+            // 
+            // PCOUNT
+            // 
+            this.PCOUNT.DataPropertyName = "PCOUNT";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.Format = "N0";
+            this.PCOUNT.DefaultCellStyle = dataGridViewCellStyle3;
+            this.PCOUNT.HeaderText = "产量";
+            this.PCOUNT.Name = "PCOUNT";
+            this.PCOUNT.ReadOnly = true;
+            this.PCOUNT.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // HEGE
+            // 
+            this.HEGE.DataPropertyName = "HEGE";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Format = "N0";
+            this.HEGE.DefaultCellStyle = dataGridViewCellStyle4;
+            this.HEGE.HeaderText = "合格数";
+            this.HEGE.Name = "HEGE";
+            this.HEGE.ReadOnly = true;
+            this.HEGE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // BUHEGE
+            // 
+            this.BUHEGE.DataPropertyName = "BUHEGE";
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle5.Format = "N0";
+            this.BUHEGE.DefaultCellStyle = dataGridViewCellStyle5;
+            this.BUHEGE.HeaderText = "不合格";
+            this.BUHEGE.Name = "BUHEGE";
+            this.BUHEGE.ReadOnly = true;
+            this.BUHEGE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // FANGONG
+            // 
+            this.FANGONG.DataPropertyName = "FANGONG";
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle6.Format = "N0";
+            this.FANGONG.DefaultCellStyle = dataGridViewCellStyle6;
+            this.FANGONG.HeaderText = "返工数";
+            this.FANGONG.Name = "FANGONG";
+            this.FANGONG.ReadOnly = true;
+            // 
+            // HEGELV
+            // 
+            this.HEGELV.DataPropertyName = "HEGELV";
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle7.Format = "P2";
+            dataGridViewCellStyle7.NullValue = "#DIV/0!";
+            this.HEGELV.DefaultCellStyle = dataGridViewCellStyle7;
+            this.HEGELV.HeaderText = "合格率";
+            this.HEGELV.Name = "HEGELV";
+            this.HEGELV.ReadOnly = true;
+            this.HEGELV.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // g2PROCEDURENAME
+            // 
+            this.g2PROCEDURENAME.DataPropertyName = "PROCEDURENAME";
+            this.g2PROCEDURENAME.HeaderText = "工序名称";
+            this.g2PROCEDURENAME.Name = "g2PROCEDURENAME";
+            this.g2PROCEDURENAME.ReadOnly = true;
+            // 
+            // defectcode
+            // 
+            this.defectcode.DataPropertyName = "defectcode";
+            this.defectcode.HeaderText = "缺陷码";
+            this.defectcode.Name = "defectcode";
+            this.defectcode.ReadOnly = true;
+            this.defectcode.Visible = false;
+            // 
+            // DEFECTNAME
+            // 
+            this.DEFECTNAME.DataPropertyName = "DEFECTNAME";
+            this.DEFECTNAME.HeaderText = "缺陷名";
+            this.DEFECTNAME.Name = "DEFECTNAME";
+            this.DEFECTNAME.ReadOnly = true;
+            // 
+            // DCOUNT
+            // 
+            this.DCOUNT.DataPropertyName = "DCOUNT";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Format = "N0";
+            this.DCOUNT.DefaultCellStyle = dataGridViewCellStyle11;
+            this.DCOUNT.HeaderText = "缺陷数";
+            this.DCOUNT.Name = "DCOUNT";
+            this.DCOUNT.ReadOnly = true;
+            // 
+            // F_RPT_040115
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1002, 476);
+            this.Controls.Add(this.splitContainer1);
+            this.Controls.Add(this.tsrOperate);
+            this.Controls.Add(this.gbxCondition);
+            this.Name = "F_RPT_040115";
+            this.Text = "半成品工序质量表";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_RPT_040113_FormClosed);
+            this.Load += new System.EventHandler(this.F_RPT_040113_Load);
+            this.tsrOperate.ResumeLayout(false);
+            this.tsrOperate.PerformLayout();
+            this.gbxCondition.ResumeLayout(false);
+            this.gbxCondition.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvRpt)).EndInit();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private Basics.BaseControls.C_ToolStrip tsrOperate;
+        private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+        private System.Windows.Forms.ToolStripButton tsbtnClose;
+        private Basics.BaseControls.C_Label lblAccountDateStart;
+        private Basics.BaseControls.C_DateTimePicker dtpAccountDateStart;
+        private Basics.BaseControls.C_Button btnClearCondition;
+        private Basics.BaseControls.C_Button btnSearch;
+        private Basics.BaseControls.C_GroupBox gbxCondition;
+        private Basics.BaseControls.C_DataGridView dgvRpt;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private Basics.BaseControls.C_DataGridView dgvD;
+        private Basics.BaseControls.C_Label c_Label1;
+        private Basics.BaseControls.C_DateTimePicker dtpAccountDateEnd;
+        private Controls.SearchBox.ScbGoods scbGoods;
+        private Basics.BaseControls.C_Label lblGoods;
+        private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox;
+        private Basics.BaseControls.C_Label lblGoodsType;
+        private Controls.SearchBox.ScbGoodsType scbGoodsType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1PROCEDUREID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1gtcode2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1PROCEDURENAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g1goodstypename;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PCOUNT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HEGE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BUHEGE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn FANGONG;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HEGELV;
+        private System.Windows.Forms.DataGridViewTextBoxColumn g2PROCEDURENAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn defectcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DEFECTNAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DCOUNT;
+    }
+}

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

@@ -0,0 +1,264 @@
+
+/*******************************************************************************
+ * Copyright(c) 2015 DongkeSoft All rights reserved. / Confidential
+ * 类的信息：
+ *      1.程序名称：F_RPT_040115.cs
+ *      2.功能描述：半成品工序质量表
+ * 编辑履历：
+ *      作者            日期                版本            修改内容
+ *      陈晓野          2019/07/16          1.00            新建
+ *******************************************************************************/
+
+using System;
+using System.Data;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Client.Controls;
+using Dongke.IBOSS.PRD.Client.DataModels;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.ReportModule
+{
+    /// <summary>
+    /// 半成品工序质量表
+    /// </summary>
+    public partial class F_RPT_040115 : DKDockPanelBase
+	{
+		#region 成员变量
+
+		// 窗体的单例模式
+		private static F_RPT_040115 _instance;
+
+        private ClientRequestEntity _cre = null;
+
+        private bool _init = false;
+        #endregion
+
+        #region 构造函数
+
+        public F_RPT_040115()
+		{
+			InitializeComponent();
+			// 窗体显示的Title
+			this.Text = "半成品工序质量表";
+			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+			this.btnSearch.Text = ButtonText.BTN_SEARCH;
+			this.btnClearCondition.Text = ButtonText.BTN_CLEARCONDITION;
+			this.gbxCondition.Text = Constant.LABEL_QUERY_CONDITIONS;
+		}
+
+		#endregion
+
+		#region 单例模式
+
+		/// <summary>
+		/// 单例模式，防止重复创建窗体
+		/// </summary>
+		public static F_RPT_040115 Instance
+		{
+			get
+			{
+				if (_instance == null || _instance.IsDisposed)
+				{
+					_instance = new F_RPT_040115();
+				}
+				return _instance;
+			}
+		}
+
+		#endregion
+
+		#region  事件处理
+
+		/// <summary>
+		/// 窗体加载事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_RPT_040113_Load(object sender, EventArgs e)
+		{
+			try
+			{
+                // 加载权限
+                FormPermissionManager.FormPermissionControl(this.Name, this,
+                    LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+                    LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+
+                // 设置表格不自动创建列
+                this.dgvRpt.AutoGenerateColumns = false;
+                this.dgvD.AutoGenerateColumns = false;
+				// 初始化时间控件为当前日期
+				this.dtpAccountDateStart.Value = DateTime.Now.Date;
+                this.dtpAccountDateEnd.Value = DateTime.Now.Date;
+                this.scbGoodsType.ClearValue();
+
+            }
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 自动适应列宽
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnAdaptive_Click(object sender, EventArgs e)
+		{
+			this.dgvRpt.AutoResizeColumns();
+            this.dgvD.AutoResizeColumns();
+        }
+
+		/// <summary>
+		/// 窗体关闭事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_RPT_040113_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			_instance = null;
+		}
+
+		/// <summary>
+		/// 关闭按钮
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		/// <summary>
+		/// 查询按钮事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnSearch_Click(object sender, EventArgs e)
+		{
+            try
+            {
+                _init = true;
+
+                this.dgvRpt.DataSource = null;
+                this.dgvD.DataSource = null;
+
+                _cre = new ClientRequestEntity();
+                _cre.NameSpace = "R04";
+                _cre.Name = "R040115";
+
+                _cre.Properties["timebegin"] = this.dtpAccountDateStart.Value.Date;
+                _cre.Properties["timeend"] = this.dtpAccountDateEnd.Value.Date.AddDays(1);
+
+                _cre.Properties["gtcode"] = this.scbGoodsType.SearchedValue + "";
+                _cre.Properties["GoodsIDS"] = scbGoods.CheckedPKMember;
+                _cre.Properties["ProcedureIDS"] = dkProcedureSearchBox.ProcedureIDS;
+
+                ServiceResultEntity resultEntity = DoAsync<ServiceResultEntity>(() =>
+                {
+                    return ReportModuleProxy.Service.DoRequest(_cre);
+                });
+
+                if (resultEntity != null && resultEntity.Data != null &&
+                    resultEntity.Data.Tables.Count > 0)
+                {
+                    this.dgvRpt.DataSource = resultEntity.Data.Tables[0];
+                    if (resultEntity.Data.Tables.Count > 1)
+                    {
+                        this.dgvD.DataSource = resultEntity.Data.Tables[1];
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                this.btnSearch.Enabled = true;
+                this.btnClearCondition.Enabled = true;
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+            finally
+            {
+                _init = false;
+            }
+		}
+
+		/// <summary>
+		/// 清空条件按钮事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnClearCondition_Click(object sender, EventArgs e)
+        {
+            this.dtpAccountDateStart.Value = DateTime.Now.Date;
+            this.dtpAccountDateEnd.Value = DateTime.Now.Date;
+            this.scbGoodsType.ClearValue();
+            this.scbGoods.ClearValue();
+            this.dkProcedureSearchBox.ClearControl();
+        }
+
+        private void dgvRpt_SelectionChanged(object sender, EventArgs e)
+        {
+            if (_init || this.dgvRpt.CurrentRow == null)
+            {
+                return;
+            }
+            try
+            {
+                string pcode = this.dgvRpt.CurrentRow.Cells["g1PROCEDUREID"].Value + "";
+                if (pcode == "0")
+                {
+                    this.dgvD.DataSource = null;
+                    return;
+                }
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "R04";
+                cre.Name = "R040115D";
+
+                if (_cre != null)
+                {
+                    cre.Properties["timebegin"] = _cre.Properties["timebegin"];
+                    cre.Properties["timeend"] = _cre.Properties["timeend"];
+                    cre.Properties["gtcode"] = _cre.Properties["gtcode"];
+                    cre.Properties["GoodsIDS"] = _cre.Properties["GoodsIDS"];
+                    cre.Properties["ProcedureIDS"] = _cre.Properties["ProcedureIDS"];
+                }
+                else
+                {
+                    cre.Properties["timebegin"] = this.dtpAccountDateStart.Value.Date;
+                    cre.Properties["timeend"] = this.dtpAccountDateEnd.Value.Date.AddDays(1);
+                }
+                cre.Properties["PROCEDUREID"] = this.dgvRpt.CurrentRow.Cells["g1PROCEDUREID"].Value;
+
+                ServiceResultEntity resultEntity = ReportModuleProxy.Service.DoRequest(cre);
+
+                this.dgvD.DataSource = null;
+                if (resultEntity != null || resultEntity.Data != null ||
+                    resultEntity.Data.Tables.Count > 0)
+                {
+                    this.dgvD.DataSource = resultEntity.Data.Tables[0];
+                }
+            }
+            catch (Exception ex)
+            {
+                this.btnSearch.Enabled = true;
+                this.btnClearCondition.Enabled = true;
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+        #endregion
+
+        #region  私有方法
+
+        #endregion
+    }
+}

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

@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        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
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
+        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
+        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
+        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
+        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
+        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
+        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
+        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
+        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
+        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
+        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
+        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
+        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
+        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
+        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
+        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
+        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
+        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
+        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
+        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
+        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
+        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
+        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
+        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
+        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
+        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
+        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
+        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
+        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
+        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
+        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
+        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
+        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
+        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
+        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
+        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
+        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
+        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
+        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
+        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
+        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
+        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
+        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="g1PROCEDUREID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="g1gtcode2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="g1PROCEDURENAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="g1goodstypename.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HEGE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BUHEGE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="FANGONG.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HEGELV.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="g2PROCEDURENAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="defectcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DEFECTNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DCOUNT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>45</value>
+  </metadata>
+</root>

DK.Client/ReportModule/ReportModule.csproj

@@ -422,6 +422,12 @@
     <Compile Include="R04\M01\F_RPT_040107.Designer.cs">
       <DependentUpon>F_RPT_040107.cs</DependentUpon>
     </Compile>
+    <Compile Include="R04\M01\F_RPT_040115.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="R04\M01\F_RPT_040115.Designer.cs">
+      <DependentUpon>F_RPT_040115.cs</DependentUpon>
+    </Compile>
     <Compile Include="R08\F_RPT_080109.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -641,6 +647,9 @@
     <EmbeddedResource Include="R04\M01\F_RPT_040107.resx">
       <DependentUpon>F_RPT_040107.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="R04\M01\F_RPT_040115.resx">
+      <DependentUpon>F_RPT_040115.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="R08\F_RPT_080109.resx">
       <DependentUpon>F_RPT_080109.cs</DependentUpon>
     </EmbeddedResource>

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -15241,7 +15241,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 		}
 
         /// <summary>
-        /// 各工序质量表-恒洁三水
+        /// 成品工艺质量表-恒洁三水
         /// </summary>
         /// <param name="cre"></param>
         /// <param name="sUserInfo"></param>
@@ -15251,13 +15251,26 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
             try
             {
-                int p1ID = 11; // 成检交接工序
-                int p2ID = 12; // 成检登记工序
+                //int p1ID = 11; // 成检交接工序
+                //int p2ID = 12; // 成检登记工序
                 string gtcode2 = cre.Properties["gtcode2"] + "";
                 if (gtcode2 != "001001" && gtcode2 != "001002")
                 {
                     gtcode2 = "[ALL]";
                 }
+
+                string GoodsIDS = cre.Properties["GoodsIDS"] + "";
+                string KilnID = cre.Properties["KilnID"] + "";
+                if (string.IsNullOrWhiteSpace(GoodsIDS))
+                {
+                    GoodsIDS = "0";
+                }
+                int kid = 0;
+                if (!string.IsNullOrWhiteSpace(KilnID))
+                {
+                    kid = Convert.ToInt32(KilnID);
+                }
+
                 // DEFECTDEDUCTIONNUM 缺陷扣除数 1,2,5
                 // goodsleveltypeid 次品 7
 
@@ -15286,6 +15299,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15293,6 +15309,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 //"           and dd.procedureid = :p2ID\n" +
                 "           and (dd.procedureid = 12 or (dd.procedureid = 105 and pd.isrefire='0')) \n" +
                 // end
+
                 "           and dd.checktime >= :timebegin\n" +
                 "           and dd.checktime < :timeend\n" +
                 ////"           -- 交坯、干补\n" +
@@ -15317,6 +15334,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15350,6 +15370,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15381,6 +15404,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15414,6 +15440,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15445,6 +15474,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15490,6 +15522,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15523,6 +15558,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on length(gt2.goodstypecode)=6 and gt2.accountid = gt.accountid and instr(gt.goodstypecode, gt2.goodstypecode)=1\n" +
                 "         where dd.valueflag = '1'\n" +
                 "           and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
@@ -15553,6 +15591,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
                 //"                and pd.procedureid = :p1ID\n" +
                 // end
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "                and pd.createtime >= :timebegin\n" +
                 "                and pd.createtime < :timeend\n" +
                 "              group by gt2.goodstypecode) outk\n" +
@@ -15570,6 +15611,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     new OracleParameter(":timebegin",OracleDbType.Date, cre.Properties["timebegin"], ParameterDirection.Input),
                     new OracleParameter(":timeend",OracleDbType.Date, cre.Properties["timeend"], ParameterDirection.Input),
                     new OracleParameter(":gtcode2",OracleDbType.Varchar2, gtcode2, ParameterDirection.Input),
+
+                new OracleParameter(":GoodsIDS", OracleDbType.NVarchar2, GoodsIDS, ParameterDirection.Input),
+                new OracleParameter(":KilnID", OracleDbType.Int32, kid, ParameterDirection.Input),
                 };
 
                 ServiceResultEntity sre = new ServiceResultEntity();
@@ -15619,6 +15663,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "           and instr(gt.goodstypecode, gt2.goodstypecode) = 1\n" +
                 "         where ((pd.procedureid <> 104 and pd.valueflag = '1') or (pd.procedureid = 104 and pd.checkflag = '1'))\n" +
                 "           and pd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and (:gtcode2 = '[ALL]' or gt2.goodstypecode = :gtcode2)\n" +
                 // 恒洁三车间特殊处理（质量相关）
                 //"           and (pd.procedureid = :p1ID or pd.procedureid = :p2ID)\n" +
@@ -15638,6 +15685,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     new OracleParameter(":timebegin",OracleDbType.Date, cre.Properties["timebegin"], ParameterDirection.Input),
                     new OracleParameter(":timeend",OracleDbType.Date, cre.Properties["timeend"], ParameterDirection.Input),
                     new OracleParameter(":gtcode2",OracleDbType.Varchar2, gtcode2, ParameterDirection.Input),
+
+                new OracleParameter(":GoodsIDS", OracleDbType.NVarchar2, GoodsIDS, ParameterDirection.Input),
+                new OracleParameter(":KilnID", OracleDbType.Int32, kid, ParameterDirection.Input),
                 };
                 DataTable alldata = oracleConn.GetSqlResultToDt(sqlString, oracleParameter);
                 alldata.TableName = "A";
@@ -15660,7 +15710,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         }
 
         /// <summary>
-        /// 各工序质量表-缺陷明细-恒洁三水
+        /// 成品工艺质量表-缺陷明细-恒洁三水
         /// </summary>
         /// <param name="cre"></param>
         /// <param name="sUserInfo"></param>
@@ -15671,9 +15721,21 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             try
             {
                 //int p1ID = 11; // 成检交接工序
-                int p2ID = 12; // 成检登记工序
+                //int p2ID = 12; // 成检登记工序
                 int pcode = Convert.ToInt32(cre.Properties["pcode"]);
 
+                string GoodsIDS = cre.Properties["GoodsIDS"] + "";
+                string KilnID = cre.Properties["KilnID"] + "";
+                if (string.IsNullOrWhiteSpace(GoodsIDS))
+                {
+                    GoodsIDS = "0";
+                }
+                int kid = 0;
+                if (!string.IsNullOrWhiteSpace(KilnID))
+                {
+                    kid = Convert.ToInt32(KilnID);
+                }
+
                 string sqlString =
                 "select :pcode pcode\n" +
                 "      ,:pname pname\n" +
@@ -15695,6 +15757,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "   and gt2.accountid = :accountid\n" +
                 " where dd.valueflag = '1'\n" +
                 "   and dd.accountid = :accountid\n" +
+                "           and (:KilnID = 0 or pd.KilnID = :KilnID)\n" +
+                "           AND (:GoodsIDS = '0' or instr(','||:GoodsIDS||',',','||pd.GoodsId||',')>0)\n" +
+
                 "           and pd.goodsleveltypeid = 7\n" + // 次品
                 "           and dd.DEFECTDEDUCTIONNUM in (1,2,5)\n" + // 缺陷扣除数 1,2,5
                 // 恒洁三车间特殊处理（质量相关）
@@ -15806,10 +15871,171 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     new OracleParameter("gtcode2",OracleDbType.Varchar2, cre.Properties["gtcode2"], ParameterDirection.Input),
                     new OracleParameter("timebegin",OracleDbType.Date, cre.Properties["timebegin"], ParameterDirection.Input),
                     new OracleParameter("timeend",OracleDbType.Date, cre.Properties["timeend"], ParameterDirection.Input),
+
+                new OracleParameter(":GoodsIDS", OracleDbType.NVarchar2, GoodsIDS, ParameterDirection.Input),
+                new OracleParameter(":KilnID", OracleDbType.Int32, kid, ParameterDirection.Input),
+                };
+
+                ServiceResultEntity sre = new ServiceResultEntity();
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                if (oracleConn.ConnState == ConnectionState.Open)
+                {
+                    oracleConn.Close();
+                }
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 成品工艺质量表-恒洁三水
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <param name="sUserInfo"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetRPT040115Data(ClientRequestEntity cre, SUserInfo sUserInfo)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            try
+            {
+                string gtcode = cre.Properties["gtcode"] + "";
+                string ProcedureIDS = cre.Properties["ProcedureIDS"] + "";
+                string GoodsIDS = cre.Properties["GoodsIDS"] + "";
+
+                string sqlString = 
+                "SELECT NVL(PP.PROCEDUREID, -1) PROCEDUREID\n" +
+                "      ,NVL(PP.PROCEDURENAME, '合计') PROCEDURENAME\n" +
+                "      ,SUM(PP.PCOUNT) PCOUNT\n" +
+                "      ,SUM(PP.PCOUNT) - SUM(PP.BUHEGE) - SUM(PP.FANGONG) HEGE\n" +
+                "      ,SUM(PP.BUHEGE) BUHEGE\n" +
+                "      ,SUM(PP.FANGONG) FANGONG\n" +
+                "      ,round((SUM(PP.PCOUNT) - SUM(PP.BUHEGE) - SUM(PP.FANGONG)) / SUM(PP.PCOUNT),4) HEGELV\n" +
+                "  FROM (\n" +
+                "        -- 成型产量\n" +
+                "        SELECT 0 PROCEDUREID\n" +
+                "               ,'成型' PROCEDURENAME\n" +
+                "               ,0 DISPLAYNO\n" +
+                "               ,T.GOODSID\n" +
+                "               ,1 PCOUNT\n" +
+                "               ,0 BUHEGE\n" +
+                "               ,0 FANGONG\n" +
+                "          FROM TP_PM_GROUTINGDAILYDETAIL T\n" +
+                "         WHERE T.VALUEFLAG = '1'\n" +
+                "           AND T.GROUTINGFLAG = '1'\n" +
+                "           AND T.CREATETIME >= :timebegin\n" +
+                "           AND T.CREATETIME < :timeend\n" +
+                "        UNION ALL\n" +
+                "        -- 成型不合格-报损\n" +
+                "        SELECT 0 PROCEDUREID\n" +
+                "               ,'成型' PROCEDURENAME\n" +
+                "               ,0 DISPLAYNO\n" +
+                "               ,T.GOODSID\n" +
+                "               ,0 PCOUNT\n" +
+                "               ,1 BUHEGE\n" +
+                "               ,0 FANGONG\n" +
+                "          FROM TP_PM_GROUTINGDAILYDETAIL T\n" +
+                "         WHERE T.VALUEFLAG = '1'\n" +
+                "           AND T.GROUTINGFLAG = '1'\n" +
+                "           AND T.SCRAPFLAG = '1'\n" +
+                "           AND T.SCRAPTIME >= :timebegin\n" +
+                "           AND T.SCRAPTIME < :timeend\n" +
+                "        UNION ALL\n" +
+                "        -- 工序产量\n" +
+                "        SELECT T.PROCEDUREID\n" +
+                "               ,TO_CHAR(P.PROCEDURENAME)\n" +
+                "               ,P.DISPLAYNO\n" +
+                "               ,T.GOODSID\n" +
+                "               ,1 PCOUNT\n" +
+                "               ,0 BUHEGE\n" +
+                "               ,0 FANGONG\n" +
+                "          FROM TP_PM_PRODUCTIONDATA T\n" +
+                "         INNER JOIN TP_PC_PROCEDURE P\n" +
+                "            ON T.PROCEDUREID = P.PROCEDUREID\n" +
+                "         WHERE T.VALUEFLAG = '1'\n" +
+                "           AND P.IS_BEFOREFIRE = '1'\n" +
+                "           AND T.CREATETIME >= :timebegin\n" +
+                "           AND T.CREATETIME < :timeend\n" +
+                "        UNION ALL\n" +
+                "        -- 工序不合格\n" +
+                "        SELECT T.PROCEDUREID\n" +
+                "               ,TO_CHAR(P.PROCEDURENAME)\n" +
+                "               ,P.DISPLAYNO\n" +
+                "               ,T.GOODSID\n" +
+                "               ,0 PCOUNT\n" +
+                "               ,1 BUHEGE\n" +
+                "               ,0 FANGONG\n" +
+                "          FROM TP_PM_SCRAPPRODUCT T\n" +
+                "         INNER JOIN TP_PC_PROCEDURE P\n" +
+                "            ON T.PROCEDUREID = P.PROCEDUREID\n" +
+                "         WHERE T.VALUEFLAG = '1'\n" +
+                "           AND P.IS_BEFOREFIRE = '1'\n" +
+                "           AND T.AUDITSTATUS = '1'\n" +
+                "           AND T.GOODSLEVELTYPEID IN (8, 9, 13, 14)\n" +
+                "           AND T.AUDITDATE >= :timebegin\n" +
+                "           AND T.AUDITDATE < :timeend\n" +
+                "        UNION ALL\n" +
+                "        -- 半检返工\n" +
+                "        SELECT T.PROCEDUREID\n" +
+                "               ,TO_CHAR(P.PROCEDURENAME)\n" +
+                "               ,P.DISPLAYNO\n" +
+                "               ,T.GOODSID\n" +
+                "               ,0 PCOUNT\n" +
+                "               ,0 BUHEGE\n" +
+                "               ,1 FANGONG\n" +
+                "          FROM TP_PM_SEMICHECK T\n" +
+                "         INNER JOIN TP_PC_PROCEDURE P\n" +
+                "            ON T.PROCEDUREID = P.PROCEDUREID\n" +
+                "         WHERE T.VALUEFLAG = '1'\n" +
+                "           AND P.IS_BEFOREFIRE = '1'\n" +
+                "           AND T.SEMICHECKTYPE = 2\n" +
+                "           AND T.CREATETIME >= :timebegin\n" +
+                "           AND T.CREATETIME < :timeend) PP\n" +
+                " INNER JOIN TP_MST_GOODS G\n" +
+                "    ON G.GOODSID = PP.GOODSID\n" +
+                " INNER JOIN TP_MST_GOODSTYPE GT\n" +
+                "    ON GT.GOODSTYPEID = G.GOODSTYPEID\n" +
+                " WHERE \n" +
+                "       (:gtcode is null or instr(GT.GOODSTYPECODE,:gtcode)=1)\n" +
+                "           AND (:GoodsIDS is null or instr(','||:GoodsIDS||',',','||PP.GOODSID||',')>0)\n" +
+                "           AND (:ProcedureIDS is null or instr(','||:ProcedureIDS||',',','||PP.PROCEDUREID||',')>0)\n" +
+                " GROUP BY GROUPING SETS((PP.PROCEDUREID, PP.PROCEDURENAME, PP.DISPLAYNO), ())\n" +
+                " ORDER BY PP.DISPLAYNO\n" +
+                "         ,PP.PROCEDURENAME";
+
+
+                OracleParameter[] oracleParameter = new OracleParameter[]
+                {
+                    //new OracleParameter(":accountid",OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
+                    new OracleParameter(":timebegin",OracleDbType.Date, cre.Properties["timebegin"], ParameterDirection.Input),
+                    new OracleParameter(":timeend",OracleDbType.Date, cre.Properties["timeend"], ParameterDirection.Input),
+                    new OracleParameter(":gtcode",OracleDbType.Varchar2, gtcode, ParameterDirection.Input),
+                    new OracleParameter(":GoodsIDS", OracleDbType.Varchar2, GoodsIDS, ParameterDirection.Input),
+                    new OracleParameter(":ProcedureIDS",OracleDbType.Varchar2, ProcedureIDS, ParameterDirection.Input),
                 };
 
                 ServiceResultEntity sre = new ServiceResultEntity();
                 sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+
+                if (sre.Data != null && sre.Data.Tables.Count > 0 && sre.Data.Tables[0].Rows.Count > 0)
+                {
+                    sre.Data.Tables[0].TableName = "S";
+                    int PROCEDUREID = Convert.ToInt32(sre.Data.Tables[0].Rows[0]["PROCEDUREID"]);
+                    if (PROCEDUREID != 0)
+                    {
+                        cre.Properties["PROCEDUREID"] = sre.Data.Tables[0].Rows[0]["PROCEDUREID"];
+                        ServiceResultEntity sre1 = GetRPT040115DData(cre, sUserInfo);
+                        if (sre1 != null && sre1.Data != null && sre1.Data.Tables.Count > 0)
+                        {
+                            sre1.Data.Tables[0].TableName = "D";
+                            sre.Data.Merge(sre1.Data.Tables[0]);
+                        }
+                    }
+                }
+
                 return sre;
             }
             catch (Exception ex)
@@ -15823,6 +16049,95 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
         }
 
         /// <summary>
+        /// 成品工艺质量表-缺陷明细-恒洁三水
+        /// </summary>
+        /// <param name="cre"></param>
+        /// <param name="sUserInfo"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity GetRPT040115DData(ClientRequestEntity cre, SUserInfo sUserInfo)
+        {
+            IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+            try
+            {
+                string gtcode = cre.Properties["gtcode"] + "";
+                string ProcedureIDS = cre.Properties["ProcedureIDS"] + "";
+                string GoodsIDS = cre.Properties["GoodsIDS"] + "";
+                int PROCEDUREID = Convert.ToInt32(cre.Properties["PROCEDUREID"]);
+
+                string sqlString = "\n" +
+                "SELECT P.PROCEDURENAME\n" +
+                "      ,SD.DEFECTNAME\n" +
+                "      ,COUNT(SD.SEMICHECKDEFECTID) DCOUNT\n" +
+                "  FROM TP_PM_SEMICHECK T\n" +
+                " INNER JOIN TP_PC_PROCEDURE P\n" +
+                "    ON P.PROCEDUREID = T.PROCEDUREID\n" +
+                " INNER JOIN TP_PM_SEMICHECKDEFECT SD\n" +
+                "    ON SD.SEMICHECKID = T.SEMICHECKID\n" +
+                " INNER JOIN TP_MST_GOODS G\n" +
+                "    ON G.GOODSID = T.GOODSID\n" +
+                " INNER JOIN TP_MST_GOODSTYPE GT\n" +
+                "    ON GT.GOODSTYPEID = G.GOODSTYPEID\n" +
+                " WHERE T.VALUEFLAG = '1'\n" +
+                //"   AND T.PROCEDUREID = 65\n" +
+                "   AND (:gtcode is null or instr(GT.GOODSTYPECODE,:gtcode)=1)\n" +
+                "   AND (:GoodsIDS is null or instr(','||:GoodsIDS||',',','||G.GOODSID||',')>0)\n" +
+                "   AND ((:PROCEDUREID = -1 and (:ProcedureIDS is null or instr(','||:ProcedureIDS||',',','||T.PROCEDUREID||',')>0)) or (:PROCEDUREID <> -1 and T.PROCEDUREID=:PROCEDUREID))\n" +
+                "   AND T.CREATETIME >= :timebegin\n" +
+                "   AND T.CREATETIME < :timeend\n" +
+                "   AND SD.VALUEFLAG = '1'\n" +
+                " GROUP BY P.PROCEDURENAME\n" +
+                "         ,SD.DEFECTNAME\n" +
+                "UNION ALL\n" +
+                "SELECT P.PROCEDURENAME\n" +
+                "      ,T.RREASON\n" +
+                "      ,COUNT(T.SCRAPPRODUCTID) DCOUNT\n" +
+                "  FROM TP_PM_SCRAPPRODUCT T\n" +
+                " INNER JOIN TP_PC_PROCEDURE P\n" +
+                "    ON T.PROCEDUREID = P.PROCEDUREID\n" +
+                " INNER JOIN TP_MST_GOODS G\n" +
+                "    ON G.GOODSID = T.GOODSID\n" +
+                " INNER JOIN TP_MST_GOODSTYPE GT\n" +
+                "    ON GT.GOODSTYPEID = G.GOODSTYPEID\n" +
+                " WHERE T.VALUEFLAG = '1'\n" +
+                "   AND P.IS_BEFOREFIRE = '1'\n" +
+                "   AND T.AUDITSTATUS = '1'\n" +
+                //"   AND T.PROCEDUREID = 65\n" +
+                "   AND (:gtcode is null or instr(GT.GOODSTYPECODE,:gtcode)=1)\n" +
+                "   AND (:GoodsIDS is null or instr(','||:GoodsIDS||',',','||G.GOODSID||',')>0)\n" +
+                "   AND ((:PROCEDUREID = -1 and (:ProcedureIDS is null or instr(','||:ProcedureIDS||',',','||T.PROCEDUREID||',')>0)) or (:PROCEDUREID <> -1 and T.PROCEDUREID=:PROCEDUREID))\n" +
+                "   AND T.GOODSLEVELTYPEID IN (8, 9)\n" +
+                "   AND T.AUDITDATE >= :timebegin\n" +
+                "   AND T.AUDITDATE < :timeend\n" +
+                " GROUP BY P.PROCEDURENAME\n" +
+                "         ,T.RREASON";
+
+                OracleParameter[] oracleParameter = new OracleParameter[]
+                {
+                    //new OracleParameter("accountid",OracleDbType.Int32, sUserInfo.AccountID, ParameterDirection.Input),
+                    new OracleParameter(":timebegin",OracleDbType.Date, cre.Properties["timebegin"], ParameterDirection.Input),
+                    new OracleParameter(":timeend",OracleDbType.Date, cre.Properties["timeend"], ParameterDirection.Input),
+                    new OracleParameter(":gtcode",OracleDbType.Varchar2, gtcode, ParameterDirection.Input),
+                    new OracleParameter(":GoodsIDS", OracleDbType.Varchar2, GoodsIDS, ParameterDirection.Input),
+                    new OracleParameter(":ProcedureIDS",OracleDbType.Varchar2, ProcedureIDS, ParameterDirection.Input),
+                    new OracleParameter(":PROCEDUREID",OracleDbType.Int32, PROCEDUREID, ParameterDirection.Input),
+                };
+
+                ServiceResultEntity sre = new ServiceResultEntity();
+                sre.Data = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                if (oracleConn.ConnState == ConnectionState.Open)
+                {
+                    oracleConn.Close();
+                }
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
         /// 综合合格率分析表-半成品报废率分析表
         /// </summary>
         /// <param name="cre"></param>

IBOSS.PRD/F_SYS_0202.cs

@@ -952,9 +952,13 @@ namespace Dongke.IBOSS.PRD.Client
 									this.ShowInDockPanel(F_RPT_040106.Instance);
 									break;
                                 case "040113":
-                                    // 各工序质量表
+                                    // 成品工艺质量表
                                     this.ShowInDockPanel(F_RPT_040113.Instance);
                                     break;
+                                case "040115":
+                                    // 半成品工序质量表
+                                    this.ShowInDockPanel(F_RPT_040115.Instance);
+                                    break;
                                 case "070509":
                                     // 综合合格率分析表
                                     this.ShowInDockPanel(F_RPT_040114.Instance);

WCF.Service/WCF.Services/ReportModuleService.cs

@@ -971,21 +971,37 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 
                     #region 质量报表-恒洁三水（定制）
                     #region 各工序质量表
+                    // 成品
                     if ("R040113" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => ReportModuleLogic.GetRPT040113Data(cre, SUserInfo));
                         return result;
                     }
+                    // 半成品
+                    if ("R040115" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => ReportModuleLogic.GetRPT040115Data(cre, SUserInfo));
+                        return result;
+                    }
                     #endregion
 
                     #region 各工序质量表-明细
+                    // 成品
                     if ("R040113D" == cre.Name)
                     {
                         ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
                             () => ReportModuleLogic.GetRPT040113DData(cre, SUserInfo));
                         return result;
                     }
+                    // 半成品
+                    if ("R040115D" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                            () => ReportModuleLogic.GetRPT040115DData(cre, SUserInfo));
+                        return result;
+                    }
                     #endregion
                     #endregion