半检返修缺陷汇总表搜索条件修正

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

@@ -127,14 +127,16 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
 		/// <param name="e"></param>
 		private void tsbtnClearCondition_Click(object sender, EventArgs e)
         {
-            this.txtGoodsCode.Text = string.Empty;
-            this.txtGroutingUserCode.Text = string.Empty;
+            this.txtGoodsCode.ClearValue();
+            this.txtGroutingUserCode.ClearControl();
             this.txtSemiCheckDateTimeStart.Value = DateTime.Now.Date;
             this.txtSemiCheckDateTimeEnd.Value = this.txtSemiCheckDateTimeStart.Value.AddDays(1).AddSeconds(-1);
 
-            this.txtSemiCheckUserCode.Text = string.Empty;
-            this.txtDefectCode.Text = string.Empty;
+            this.txtSemiCheckUserCode.ClearControl();
+            this.txtDefectCode.ClearControl();
             this.dkSemiCheckDefectPositionSearchBox1.ClearControl();
+            this.scbGoodsType.ClearValue();
+            this.txtGoodsCode.ClearValue();
         }
 
 		/// <summary>
@@ -176,7 +178,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 cre.Properties["SemireWorkTimeBegin"] = this.txtSemiCheckDateTimeStart.Value;
                 cre.Properties["SemireWorkTimeEnd"] = this.txtSemiCheckDateTimeEnd.Value.AddSeconds(1);
                 // 产品编码 GOODSCODE
-                cre.Properties["GOODSCODE"] = this.txtGoodsCode.Text.Trim();
+                cre.Properties["GOODSCODE"] = this.txtGoodsCode.CheckedValue;
                 // 成型工号 GROUTINGUSERCODE
                 // xuwei modify 2019-11-13
                 //cre.Properties["GROUTINGUSERCODE"] = this.txtGroutingUserCode.Text.Trim();
@@ -192,7 +194,7 @@ 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;
+                cre.Properties["defectcode"] = this.txtDefectCode.Text;
 
                 //产品类型 xuwei add 2019-11-29
                 //cre.Properties["GOODSTYPEID"] = this.scbGoodsType.SearchedValue;

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -14713,7 +14713,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 // 产品编码 GOODSCODE
                 if (!string.IsNullOrWhiteSpace(cre.Properties["GOODSCODE"]+""))
                 {
-                    sqlString += "           and instr(sr.GOODSCODE,:GOODSCODE) > 0 \n";
+                    sqlString += "           and instr(','||:GOODSCODE||',' , ','||sr.GOODSCODE||',') > 0 \n";
                     oracleParameters.Add(new OracleParameter(":GOODSCODE", cre.Properties["GOODSCODE"]));
                 }
                 // 成型工号 GROUTINGUSERCODE
@@ -14751,10 +14751,10 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                     sqlString += "           and instr(scd.defectname,:defectname) > 0 \n";
                     oracleParameters.Add(new OracleParameter(":defectname", cre.Properties["defectname"]));
                 }
-                // 缺陷名称 scd.defectcode
+                // 缺陷编码 scd.defectcode
                 if (!string.IsNullOrWhiteSpace(cre.Properties["defectcode"] + ""))
                 {
-                    sqlString += "           and instr(scd.defectcode,:defectcode) > 0 \n";
+                    sqlString += "           and scd.defectcode = :defectcode  \n";
                     oracleParameters.Add(new OracleParameter(":defectcode", cre.Properties["defectcode"]));
                 }
 
@@ -14768,7 +14768,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 //产品类别Code xuwei add 2019-11-29 g.GOODSTYPECODE
                 if (!string.IsNullOrWhiteSpace(cre.Properties["GOODSTYPECODE"] + ""))
                 {
-                    sqlString += "           and instr(','||gt.GOODSTYPECODE||',' , ','||:GOODSTYPECODE||',') = 1 \n";
+                    sqlString += "           and instr(gt.GOODSTYPECODE , :GOODSTYPECODE) = 1 \n";
                     oracleParameters.Add(new OracleParameter(":GOODSTYPECODE", cre.Properties["GOODSTYPECODE"]));
                 }