产品编码 缺陷编码 产品类型 返修工序 选项添加

DK.Client/ReportModule/R03/M01/F_RPT_030119.Designer.cs

@@ -29,22 +29,24 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
+            this.txtDefectCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkDefectSearchBox();
+            this.dkProcedureSearchBox = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkProcedureSearchBox();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
+            this.txtGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
             this.txtSemiCheckUserCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkUserInfoSearchBox();
             this.txtGroutingUserCode = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkUserInfoSearchBox();
             this.dkSemiCheckDefectPositionSearchBox1 = new Dongke.IBOSS.PRD.Client.Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox();
-            this.txtDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
-            this.lblDefectCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.txtGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             this.txtSemiCheckDateTimeEnd = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
             this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.txtSemiCheckDateTimeStart = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DateTimePicker();
+            this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.label1 = new System.Windows.Forms.Label();
             this.tsrToolStrip1 = new Dongke.WinForm.Controls.TsrToolStrip();
@@ -64,8 +66,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.AllowUserToDeleteRows = false;
             this.dgvSum.AllowUserToModifyRows = true;
             this.dgvSum.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvSum.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)));
@@ -76,14 +78,15 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.ChildNodeColumnText = null;
             this.dgvSum.ColumnDeep = 1;
             this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            this.dgvSum.ColumnHeadersHeight = 29;
             this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.defectcode,
@@ -102,7 +105,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.IsSaveDataGridViewSetting = false;
             this.dgvSum.IsSubTotalFlag = false;
             this.dgvSum.IsTopDeep = false;
-            this.dgvSum.Location = new System.Drawing.Point(0, 122);
+            this.dgvSum.Location = new System.Drawing.Point(0, 152);
+            this.dgvSum.Margin = new System.Windows.Forms.Padding(4);
             this.dgvSum.MergeColumnNames = null;
             this.dgvSum.MergeDetailColumnNames = null;
             this.dgvSum.MergeDetailOnlyColumn = null;
@@ -113,10 +117,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.RefreshAtHscroll = false;
             this.dgvSum.RowHeadersWidth = 50;
             this.dgvSum.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvSum.RowTemplate.Height = 21;
-            this.dgvSum.Size = new System.Drawing.Size(944, 235);
+            this.dgvSum.Size = new System.Drawing.Size(1281, 294);
             this.dgvSum.SortOrderColumnName = null;
             this.dgvSum.TabIndex = 2;
             this.dgvSum.Tag = "";
@@ -145,36 +149,101 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             // 
             this.grpCollapsible1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.grpCollapsible1.Controls.Add(this.txtDefectCode);
+            this.grpCollapsible1.Controls.Add(this.dkProcedureSearchBox);
+            this.grpCollapsible1.Controls.Add(this.scbGoodsType);
+            this.grpCollapsible1.Controls.Add(this.txtGoodsCode);
             this.grpCollapsible1.Controls.Add(this.txtSemiCheckUserCode);
             this.grpCollapsible1.Controls.Add(this.txtGroutingUserCode);
             this.grpCollapsible1.Controls.Add(this.dkSemiCheckDefectPositionSearchBox1);
-            this.grpCollapsible1.Controls.Add(this.txtDefectCode);
-            this.grpCollapsible1.Controls.Add(this.lblDefectCode);
-            this.grpCollapsible1.Controls.Add(this.txtGoodsCode);
             this.grpCollapsible1.Controls.Add(this.txtSemiCheckDateTimeEnd);
             this.grpCollapsible1.Controls.Add(this.c_Label4);
             this.grpCollapsible1.Controls.Add(this.txtSemiCheckDateTimeStart);
+            this.grpCollapsible1.Controls.Add(this.c_Label1);
             this.grpCollapsible1.Controls.Add(this.lblGoodsCode);
             this.grpCollapsible1.Controls.Add(this.label1);
-            this.grpCollapsible1.Location = new System.Drawing.Point(0, 38);
+            this.grpCollapsible1.Location = new System.Drawing.Point(0, 48);
+            this.grpCollapsible1.Margin = new System.Windows.Forms.Padding(4);
             this.grpCollapsible1.Name = "grpCollapsible1";
-            this.grpCollapsible1.Size = new System.Drawing.Size(944, 78);
+            this.grpCollapsible1.Padding = new System.Windows.Forms.Padding(4);
+            this.grpCollapsible1.Size = new System.Drawing.Size(1281, 98);
             this.grpCollapsible1.TabIndex = 1;
             this.grpCollapsible1.TabStop = false;
             this.grpCollapsible1.Text = "查询条件";
             // 
+            // txtDefectCode
+            // 
+            this.txtDefectCode.DataSource = null;
+            this.txtDefectCode.DefectFineCode = null;
+            this.txtDefectCode.DefectIDS = null;
+            this.txtDefectCode.Enabled = true;
+            this.txtDefectCode.IsMustInput = false;
+            this.txtDefectCode.Location = new System.Drawing.Point(268, 60);
+            this.txtDefectCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtDefectCode.Name = "txtDefectCode";
+            this.txtDefectCode.PurviewType = ((byte)(0));
+            this.txtDefectCode.Size = new System.Drawing.Size(240, 26);
+            this.txtDefectCode.TabIndex = 45;
+            this.txtDefectCode.Title = "缺陷编码";
+            this.txtDefectCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // dkProcedureSearchBox
+            // 
+            this.dkProcedureSearchBox.BackColor = System.Drawing.Color.Transparent;
+            this.dkProcedureSearchBox.DataSource = null;
+            this.dkProcedureSearchBox.Enabled = true;
+            this.dkProcedureSearchBox.IsEnablePurview = false;
+            this.dkProcedureSearchBox.IsMustInput = false;
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(1014, 59);
+            this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
+            this.dkProcedureSearchBox.ModelType = null;
+            this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
+            this.dkProcedureSearchBox.ProcedureCode = "";
+            this.dkProcedureSearchBox.ProcedureID = null;
+            this.dkProcedureSearchBox.ProcedureIDS = null;
+            this.dkProcedureSearchBox.ProcedureName = null;
+            this.dkProcedureSearchBox.Purview = null;
+            this.dkProcedureSearchBox.PurviewType = ((byte)(0));
+            this.dkProcedureSearchBox.SelectMore = true;
+            this.dkProcedureSearchBox.Size = new System.Drawing.Size(239, 26);
+            this.dkProcedureSearchBox.TabIndex = 44;
+            this.dkProcedureSearchBox.Title = "返修工序";
+            this.dkProcedureSearchBox.TxtGoodsTypeBackColor = System.Drawing.SystemColors.Control;
+            // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(857, 59);
+            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(148, 26);
+            this.scbGoodsType.TabIndex = 43;
+            this.scbGoodsType.ValueMember = "GOODSTYPEID";
+            // 
+            // txtGoodsCode
+            // 
+            this.txtGoodsCode.CheckedData = null;
+            this.txtGoodsCode.DisplayMember = "GoodsCode";
+            this.txtGoodsCode.Location = new System.Drawing.Point(92, 26);
+            this.txtGoodsCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txtGoodsCode.MultiSelect = true;
+            this.txtGoodsCode.Name = "txtGoodsCode";
+            this.txtGoodsCode.Size = new System.Drawing.Size(167, 26);
+            this.txtGoodsCode.TabIndex = 42;
+            // 
             // txtSemiCheckUserCode
             // 
             this.txtSemiCheckUserCode.DataSource = null;
             this.txtSemiCheckUserCode.Enabled = true;
             this.txtSemiCheckUserCode.IsMustInput = false;
             this.txtSemiCheckUserCode.IsWorker = false;
-            this.txtSemiCheckUserCode.Location = new System.Drawing.Point(14, 47);
-            this.txtSemiCheckUserCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txtSemiCheckUserCode.Location = new System.Drawing.Point(19, 59);
+            this.txtSemiCheckUserCode.Margin = new System.Windows.Forms.Padding(5);
             this.txtSemiCheckUserCode.Name = "txtSemiCheckUserCode";
             this.txtSemiCheckUserCode.PurviewType = ((byte)(0));
             this.txtSemiCheckUserCode.SelectMore = true;
-            this.txtSemiCheckUserCode.Size = new System.Drawing.Size(180, 21);
+            this.txtSemiCheckUserCode.Size = new System.Drawing.Size(240, 26);
             this.txtSemiCheckUserCode.TabIndex = 7;
             this.txtSemiCheckUserCode.Title = "半检工号";
             this.txtSemiCheckUserCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
@@ -189,12 +258,12 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtGroutingUserCode.Enabled = true;
             this.txtGroutingUserCode.IsMustInput = false;
             this.txtGroutingUserCode.IsWorker = false;
-            this.txtGroutingUserCode.Location = new System.Drawing.Point(201, 20);
-            this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txtGroutingUserCode.Location = new System.Drawing.Point(268, 25);
+            this.txtGroutingUserCode.Margin = new System.Windows.Forms.Padding(5);
             this.txtGroutingUserCode.Name = "txtGroutingUserCode";
             this.txtGroutingUserCode.PurviewType = ((byte)(0));
             this.txtGroutingUserCode.SelectMore = true;
-            this.txtGroutingUserCode.Size = new System.Drawing.Size(180, 21);
+            this.txtGroutingUserCode.Size = new System.Drawing.Size(240, 26);
             this.txtGroutingUserCode.TabIndex = 2;
             this.txtGroutingUserCode.Title = "成型工号";
             this.txtGroutingUserCode.TxtUserBackColor = System.Drawing.SystemColors.Control;
@@ -210,62 +279,25 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS = null;
             this.dkSemiCheckDefectPositionSearchBox1.Enabled = true;
             this.dkSemiCheckDefectPositionSearchBox1.IsMustInput = false;
-            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(388, 47);
-            this.dkSemiCheckDefectPositionSearchBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(517, 59);
+            this.dkSemiCheckDefectPositionSearchBox1.Margin = new System.Windows.Forms.Padding(5);
             this.dkSemiCheckDefectPositionSearchBox1.Name = "dkSemiCheckDefectPositionSearchBox1";
             this.dkSemiCheckDefectPositionSearchBox1.PurviewType = ((byte)(0));
             this.dkSemiCheckDefectPositionSearchBox1.SelectMore = true;
-            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(192, 21);
+            this.dkSemiCheckDefectPositionSearchBox1.Size = new System.Drawing.Size(256, 26);
             this.dkSemiCheckDefectPositionSearchBox1.TabIndex = 10;
             this.dkSemiCheckDefectPositionSearchBox1.Title = "缺陷位置";
             this.dkSemiCheckDefectPositionSearchBox1.TxtUserBackColor = System.Drawing.SystemColors.Control;
             // 
-            // txtDefectCode
-            // 
-            this.txtDefectCode.BackColor = System.Drawing.SystemColors.Window;
-            this.txtDefectCode.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtDefectCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.txtDefectCode.ErrorMessage = "";
-            this.txtDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtDefectCode.Location = new System.Drawing.Point(260, 47);
-            this.txtDefectCode.MaxLength = 20;
-            this.txtDefectCode.Name = "txtDefectCode";
-            this.txtDefectCode.Size = new System.Drawing.Size(121, 21);
-            this.txtDefectCode.TabIndex = 9;
-            // 
-            // lblDefectCode
-            // 
-            this.lblDefectCode.AutoSize = true;
-            this.lblDefectCode.BackColor = System.Drawing.Color.Transparent;
-            this.lblDefectCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblDefectCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblDefectCode.Location = new System.Drawing.Point(201, 51);
-            this.lblDefectCode.Name = "lblDefectCode";
-            this.lblDefectCode.Size = new System.Drawing.Size(53, 12);
-            this.lblDefectCode.TabIndex = 8;
-            this.lblDefectCode.Text = "缺陷编码";
-            // 
-            // txtGoodsCode
-            // 
-            this.txtGoodsCode.BackColor = System.Drawing.SystemColors.Window;
-            this.txtGoodsCode.BackgroundColor = System.Drawing.SystemColors.Window;
-            this.txtGoodsCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-            this.txtGoodsCode.ErrorMessage = "";
-            this.txtGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGoodsCode.Location = new System.Drawing.Point(73, 20);
-            this.txtGoodsCode.MaxLength = 50;
-            this.txtGoodsCode.Name = "txtGoodsCode";
-            this.txtGoodsCode.Size = new System.Drawing.Size(121, 21);
-            this.txtGoodsCode.TabIndex = 1;
-            // 
             // txtSemiCheckDateTimeEnd
             // 
             this.txtSemiCheckDateTimeEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.txtSemiCheckDateTimeEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSemiCheckDateTimeEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txtSemiCheckDateTimeEnd.Location = new System.Drawing.Point(611, 20);
+            this.txtSemiCheckDateTimeEnd.Location = new System.Drawing.Point(815, 25);
+            this.txtSemiCheckDateTimeEnd.Margin = new System.Windows.Forms.Padding(4);
             this.txtSemiCheckDateTimeEnd.Name = "txtSemiCheckDateTimeEnd";
-            this.txtSemiCheckDateTimeEnd.Size = new System.Drawing.Size(135, 21);
+            this.txtSemiCheckDateTimeEnd.Size = new System.Drawing.Size(179, 25);
             this.txtSemiCheckDateTimeEnd.TabIndex = 6;
             this.txtSemiCheckDateTimeEnd.Value = new System.DateTime(2016, 7, 18, 0, 0, 0, 0);
             // 
@@ -275,9 +307,10 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.c_Label4.BackColor = System.Drawing.Color.Transparent;
             this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label4.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label4.Location = new System.Drawing.Point(588, 24);
+            this.c_Label4.Location = new System.Drawing.Point(784, 30);
+            this.c_Label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.c_Label4.Name = "c_Label4";
-            this.c_Label4.Size = new System.Drawing.Size(17, 12);
+            this.c_Label4.Size = new System.Drawing.Size(22, 15);
             this.c_Label4.TabIndex = 5;
             this.c_Label4.Text = "至";
             // 
@@ -286,30 +319,46 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.txtSemiCheckDateTimeStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.txtSemiCheckDateTimeStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSemiCheckDateTimeStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txtSemiCheckDateTimeStart.Location = new System.Drawing.Point(447, 20);
+            this.txtSemiCheckDateTimeStart.Location = new System.Drawing.Point(596, 25);
+            this.txtSemiCheckDateTimeStart.Margin = new System.Windows.Forms.Padding(4);
             this.txtSemiCheckDateTimeStart.Name = "txtSemiCheckDateTimeStart";
-            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(135, 21);
+            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(179, 25);
             this.txtSemiCheckDateTimeStart.TabIndex = 4;
             this.txtSemiCheckDateTimeStart.Value = new System.DateTime(2016, 7, 18, 0, 0, 0, 0);
             // 
+            // 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(782, 64);
+            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label1.Name = "c_Label1";
+            this.c_Label1.Size = new System.Drawing.Size(67, 15);
+            this.c_Label1.TabIndex = 0;
+            this.c_Label1.Text = "产品类别";
+            // 
             // lblGoodsCode
             // 
             this.lblGoodsCode.AutoSize = true;
             this.lblGoodsCode.BackColor = System.Drawing.Color.Transparent;
             this.lblGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsCode.Location = new System.Drawing.Point(14, 24);
+            this.lblGoodsCode.Location = new System.Drawing.Point(19, 30);
+            this.lblGoodsCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblGoodsCode.Name = "lblGoodsCode";
-            this.lblGoodsCode.Size = new System.Drawing.Size(53, 12);
+            this.lblGoodsCode.Size = new System.Drawing.Size(67, 15);
             this.lblGoodsCode.TabIndex = 0;
             this.lblGoodsCode.Text = "产品编码";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(388, 24);
+            this.label1.Location = new System.Drawing.Point(517, 30);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.Size = new System.Drawing.Size(67, 15);
             this.label1.TabIndex = 3;
             this.label1.Text = "半检时间";
             // 
@@ -325,7 +374,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.tsbtnClose});
             this.tsrToolStrip1.Location = new System.Drawing.Point(0, 0);
             this.tsrToolStrip1.Name = "tsrToolStrip1";
-            this.tsrToolStrip1.Size = new System.Drawing.Size(956, 35);
+            this.tsrToolStrip1.Size = new System.Drawing.Size(1297, 44);
             this.tsrToolStrip1.TabIndex = 0;
             // 
             // tsbtnSearch
@@ -380,13 +429,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             // 
             // F_RPT_030119
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(956, 357);
+            this.ClientSize = new System.Drawing.Size(1297, 446);
             this.Controls.Add(this.dgvSum);
             this.Controls.Add(this.grpCollapsible1);
             this.Controls.Add(this.tsrToolStrip1);
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_RPT_030119";
             this.Text = "半检返修缺陷汇总表";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_PC_1001_FormClosed);
@@ -412,16 +461,18 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         private System.Windows.Forms.ToolStripButton tsbtnClearCondition;
         private System.Windows.Forms.Label label1;
         private Controls.SearchTextBox.dkSemiCheckDefectPositionSearchBox dkSemiCheckDefectPositionSearchBox1;
-        private Basics.BaseControls.C_TextBox txtDefectCode;
-        private Basics.BaseControls.C_Label lblDefectCode;
-        private Basics.BaseControls.C_TextBox txtGoodsCode;
         private Basics.BaseControls.C_DateTimePicker txtSemiCheckDateTimeEnd;
         private Basics.BaseControls.C_Label c_Label4;
         private Basics.BaseControls.C_DateTimePicker txtSemiCheckDateTimeStart;
-        private Basics.BaseControls.C_Label lblGoodsCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn defectcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn defectname;
         private Controls.SearchTextBox.dkUserInfoSearchBox txtGroutingUserCode;
         private Controls.SearchTextBox.dkUserInfoSearchBox txtSemiCheckUserCode;
+        private Controls.SearchBox.ScbGoods txtGoodsCode;
+        private Basics.BaseControls.C_Label lblGoodsCode;
+        private Controls.SearchBox.ScbGoodsType scbGoodsType;
+        private Basics.BaseControls.C_Label c_Label1;
+        private Controls.SearchTextBox.dkProcedureSearchBox dkProcedureSearchBox;
+        private Controls.SearchTextBox.dkDefectSearchBox txtDefectCode;
     }
 }

DK.Client/ReportModule/R03/M01/F_RPT_030119.cs

@@ -192,7 +192,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 cre.Properties["defectpositionIDS"] = dkSemiCheckDefectPositionSearchBox1.DefectPositionIDS;
                 // 缺陷名称 scd.defectname
                 //cre.Properties["defectname"] = this.txtDefectCode.Text.Trim();
-                cre.Properties["defectcode"] = this.txtDefectCode.Text.Trim();
+                cre.Properties["defectcode"] = this.txtDefectCode.DefectFineCode.ToString();
+
+                //产品类型 xuwei add 2019-11-29
+                cre.Properties["GOODSTYPEID"] = this.scbGoodsType.SearchedValue.ToString();
+
+                //返修工序 xuwei add 2019-11-29
+                cre.Properties["REWORKPROCEDUREID"] = this.dkProcedureSearchBox.ProcedureIDS.Trim();
 
                 ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 					{

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -14691,6 +14691,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "            on scd.defectid = srd.defectid\n" +
                 "          left join tp_mst_scdefectposition scdp\n" +
                 "            on scdp.defectpositionid = srd.defectpositionid\n" +
+                "          left join TP_MST_GOODS g on g.GOODSID = sr.GOODSID\n" + //xuwei add 2019-11-29
                 "         where srd.valueflag = '1'\n" +
                 "           and sr.BACKOUTFLAG = '0'\n" +
                 "           and sr.valueflag = '1'\n" +
@@ -14755,6 +14756,21 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     sqlString += "           and instr(scd.defectcode,:defectcode) > 0 \n";
                     oracleParameters.Add(new OracleParameter(":defectcode", cre.Properties["defectcode"]));
                 }
+
+                //产品类别 xuwei add 2019-11-29 g.GOODSTYPEID
+                if (!string.IsNullOrWhiteSpace(cre.Properties["GOODSTYPEID"] + ""))
+                {
+                    sqlString += "           and instr(','||:GOODSTYPEID||',' , ','||g.GOODSTYPEID||',') > 0 \n";
+                    oracleParameters.Add(new OracleParameter(":GOODSTYPEID", cre.Properties["GOODSTYPEID"]));
+                }
+
+                //返修工序 xuwei add 2019-11-29 sr.REWORKPROCEDUREID
+                if (!string.IsNullOrWhiteSpace(cre.Properties["REWORKPROCEDUREID"] + ""))
+                {
+                    sqlString += "           and instr(','||:REWORKPROCEDUREID||',' , ','||sr.REWORKPROCEDUREID||',') > 0 \n";
+                    oracleParameters.Add(new OracleParameter(":REWORKPROCEDUREID", cre.Properties["REWORKPROCEDUREID"]));
+                }
+
                 sqlString +=
                 "         group by grouping sets((srd.defectid, scd.defectcode, scd.defectname, srd.defectpositionid),(srd.defectid, scd.defectcode, scd.defectname),(srd.defectpositionid))) t\n" +
                 "pivot(sum(cc)\n" +