修正半检返修缺陷汇总表查询

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

@@ -29,9 +29,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         /// </summary>
         private void InitializeComponent()
         {
-            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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgvSum = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.defectcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.defectname = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -66,8 +66,8 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.AllowUserToDeleteRows = false;
             this.dgvSum.AllowUserToModifyRows = true;
             this.dgvSum.AllowUserToOrderColumns = true;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+            this.dgvSum.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             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)));
@@ -78,14 +78,14 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dgvSum.ChildNodeColumnText = null;
             this.dgvSum.ColumnDeep = 1;
             this.dgvSum.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            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.dgvSum.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvSum.ColumnHeadersHeight = 29;
             this.dgvSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvSum.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -117,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;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvSum.RowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvSum.RowTemplate.Height = 21;
-            this.dgvSum.Size = new System.Drawing.Size(1281, 294);
+            this.dgvSum.Size = new System.Drawing.Size(1354, 294);
             this.dgvSum.SortOrderColumnName = null;
             this.dgvSum.TabIndex = 2;
             this.dgvSum.Tag = "";
@@ -166,7 +166,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.grpCollapsible1.Margin = new System.Windows.Forms.Padding(4);
             this.grpCollapsible1.Name = "grpCollapsible1";
             this.grpCollapsible1.Padding = new System.Windows.Forms.Padding(4);
-            this.grpCollapsible1.Size = new System.Drawing.Size(1281, 98);
+            this.grpCollapsible1.Size = new System.Drawing.Size(1354, 98);
             this.grpCollapsible1.TabIndex = 1;
             this.grpCollapsible1.TabStop = false;
             this.grpCollapsible1.Text = "查询条件";
@@ -194,7 +194,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             this.dkProcedureSearchBox.Enabled = true;
             this.dkProcedureSearchBox.IsEnablePurview = false;
             this.dkProcedureSearchBox.IsMustInput = false;
-            this.dkProcedureSearchBox.Location = new System.Drawing.Point(1014, 59);
+            this.dkProcedureSearchBox.Location = new System.Drawing.Point(1055, 59);
             this.dkProcedureSearchBox.Margin = new System.Windows.Forms.Padding(5);
             this.dkProcedureSearchBox.ModelType = null;
             this.dkProcedureSearchBox.Name = "dkProcedureSearchBox";
@@ -217,9 +217,9 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             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.Size = new System.Drawing.Size(179, 26);
             this.scbGoodsType.TabIndex = 43;
-            this.scbGoodsType.ValueMember = "GOODSTYPEID";
+            this.scbGoodsType.ValueMember = "GOODSTYPECODE";
             // 
             // txtGoodsCode
             // 
@@ -279,7 +279,7 @@ 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(517, 59);
+            this.dkSemiCheckDefectPositionSearchBox1.Location = new System.Drawing.Point(520, 59);
             this.dkSemiCheckDefectPositionSearchBox1.Margin = new System.Windows.Forms.Padding(5);
             this.dkSemiCheckDefectPositionSearchBox1.Name = "dkSemiCheckDefectPositionSearchBox1";
             this.dkSemiCheckDefectPositionSearchBox1.PurviewType = ((byte)(0));
@@ -294,7 +294,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             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(815, 25);
+            this.txtSemiCheckDateTimeEnd.Location = new System.Drawing.Point(857, 23);
             this.txtSemiCheckDateTimeEnd.Margin = new System.Windows.Forms.Padding(4);
             this.txtSemiCheckDateTimeEnd.Name = "txtSemiCheckDateTimeEnd";
             this.txtSemiCheckDateTimeEnd.Size = new System.Drawing.Size(179, 25);
@@ -307,7 +307,7 @@ 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(784, 30);
+            this.c_Label4.Location = new System.Drawing.Point(805, 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(22, 15);
@@ -319,10 +319,10 @@ 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(596, 25);
+            this.txtSemiCheckDateTimeStart.Location = new System.Drawing.Point(592, 25);
             this.txtSemiCheckDateTimeStart.Margin = new System.Windows.Forms.Padding(4);
             this.txtSemiCheckDateTimeStart.Name = "txtSemiCheckDateTimeStart";
-            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(179, 25);
+            this.txtSemiCheckDateTimeStart.Size = new System.Drawing.Size(184, 25);
             this.txtSemiCheckDateTimeStart.TabIndex = 4;
             this.txtSemiCheckDateTimeStart.Value = new System.DateTime(2016, 7, 18, 0, 0, 0, 0);
             // 
@@ -374,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(1297, 44);
+            this.tsrToolStrip1.Size = new System.Drawing.Size(1370, 44);
             this.tsrToolStrip1.TabIndex = 0;
             // 
             // tsbtnSearch
@@ -431,7 +431,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1297, 446);
+            this.ClientSize = new System.Drawing.Size(1370, 446);
             this.Controls.Add(this.dgvSum);
             this.Controls.Add(this.grpCollapsible1);
             this.Controls.Add(this.tsrToolStrip1);

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

@@ -192,13 +192,14 @@ 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.DefectFineCode.ToString();
+                cre.Properties["defectcode"] = this.txtDefectCode.DefectFineCode;
 
                 //产品类型 xuwei add 2019-11-29
-                cre.Properties["GOODSTYPEID"] = this.scbGoodsType.SearchedValue.ToString();
+                //cre.Properties["GOODSTYPEID"] = this.scbGoodsType.SearchedValue;
+                cre.Properties["GOODSTYPECODE"] = this.scbGoodsType.SearchedValue;
 
                 //返修工序 xuwei add 2019-11-29
-                cre.Properties["REWORKPROCEDUREID"] = this.dkProcedureSearchBox.ProcedureIDS.Trim();
+                cre.Properties["REWORKPROCEDUREID"] = this.dkProcedureSearchBox.ProcedureIDS;
 
                 ServiceResultEntity sre = DoAsync<ServiceResultEntity>(() =>
 					{

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -14692,6 +14692,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 "          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
+                "          left join TP_MST_GOODSTYPE gt on g.GOODSTYPEID = gt.GOODSTYPEID\n" + //xuwei add 2019-11-29
                 "         where srd.valueflag = '1'\n" +
                 "           and sr.BACKOUTFLAG = '0'\n" +
                 "           and sr.valueflag = '1'\n" +
@@ -14757,13 +14758,20 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     oracleParameters.Add(new OracleParameter(":defectcode", cre.Properties["defectcode"]));
                 }
 
-                //产品类别 xuwei add 2019-11-29 g.GOODSTYPEID
+                //产品类别ID 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"]));
                 }
 
+                //产品类别Code xuwei add 2019-11-29 g.GOODSTYPECODE
+                if (!string.IsNullOrWhiteSpace(cre.Properties["GOODSTYPECODE"] + ""))
+                {
+                    sqlString += "           and instr(','||gt.GOODSTYPECODE||',' , ','||:GOODSTYPECODE||',') = 1 \n";
+                    oracleParameters.Add(new OracleParameter(":GOODSTYPECODE", cre.Properties["GOODSTYPECODE"]));
+                }
+
                 //返修工序 xuwei add 2019-11-29 sr.REWORKPROCEDUREID
                 if (!string.IsNullOrWhiteSpace(cre.Properties["REWORKPROCEDUREID"] + ""))
                 {