增加排除试水贴码干补不良三个缺陷

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -38,7 +38,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             FROM
 	                            TP_MST_INHERITANCEDEFECTS MDF 
                             WHERE
-	                            DEFECTPROCEDUREID=3 ORDER BY  MDF.DEFECTCODE
+	                            DEFECTPROCEDUREID=3  and MDF.DEFECTCODE NOT IN ('1','2','3','001','002')  ORDER BY  MDF.DEFECTCODE
 	                            ");
 				for (int i = 0; i < dt.Rows.Count; i++)
 				{
@@ -53,7 +53,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             FROM
 	                            TP_MST_INHERITANCEDEFECTS MDF 
                             WHERE
-	                            DEFECTPROCEDUREID=3 ORDER BY  MDF.DEFECTCODE ");
+	                            DEFECTPROCEDUREID=3 and MDF.DEFECTCODE NOT IN ('1','2','3','001','002')  ORDER BY  MDF.DEFECTCODE ");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -30,7 +30,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									CASE WHEN  GD.GOODSCODE IS NULL THEN  '总计' ELSE TO_CHAR( GD.GOODSCODE )  END GOODSCODE,
 									GD.GOODSSPECIFICATION,
 									GD.GOODSNAME,
-								   TO_CHAR(COUNT( DISTINCT CASE WHEN  MDF.DEFECTTYPEID=1 AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN DF.BARCODE ELSE NULL END )) AS 成型半检缺陷__缺陷汇总,
+								    TO_CHAR(COUNT( DISTINCT CASE WHEN  MDF.DEFECTTYPEID=1 AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN DF.BARCODE ELSE NULL END )) AS 成型半检缺陷__缺陷汇总,
 									
 									SUM( CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN 1 ELSE 0 END ) AS 精修缺陷_打磨缺陷_缺陷汇总,
 									
@@ -119,6 +119,11 @@ count(distinct CASE WHEN df.DEFECTCODE IN ( '33' ) THEN DF.BARCODE ELSE NULL END
 count(distinct CASE WHEN df.DEFECTCODE IN ( '34' ) THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_裂,
 count(distinct CASE WHEN df.DEFECTCODE IN ( '001' )THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_贴码不良,
 count(distinct CASE WHEN df.DEFECTCODE IN ( '002' )THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_干补不良,
+
+count(distinct CASE WHEN df.DEFECTCODE IN ( '1' )THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_内漏不合格,
+count(distinct CASE WHEN df.DEFECTCODE IN ( '2' )THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_外漏不合格,
+count(distinct CASE WHEN df.DEFECTCODE IN ( '3' )THEN DF.BARCODE ELSE NULL END ) AS 成型半检缺陷_试水不合格,
+
 count(distinct CASE WHEN df.DEFECTCODE IN ( '10' ) THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_糙活,
 count(distinct CASE WHEN df.DEFECTCODE IN ( '12' ) THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_变形,
 count(distinct CASE WHEN df.DEFECTCODE IN ( '13' ) THEN DF.BARCODE ELSE NULL END ) AS 精修缺陷_打磨缺陷_渣,
@@ -312,6 +317,9 @@ count(distinct CASE WHEN df.DEFECTCODE IN ( '0100' ) THEN DF.BARCODE ELSE NULL E
 								to_char(nvl(s.成型半检缺陷_裂,0)) AS 成型半检缺陷__裂,
 								to_char(nvl(s.成型半检缺陷_贴码不良,0)) AS 成型半检缺陷__贴码不良,
 								to_char(nvl(s.成型半检缺陷_干补不良,0)) AS 成型半检缺陷__干补不良,
+								to_char(nvl(s.成型半检缺陷_内漏不合格,0)) AS 成型半检缺陷__内漏不合格,
+								to_char(nvl(s.成型半检缺陷_外漏不合格,0)) AS 成型半检缺陷__外漏不合格,
+								to_char(nvl(s.成型半检缺陷_试水不合格,0)) AS 成型半检缺陷__试水不合格,
 								nvl(f.成型半检缺陷__缺陷汇总,0) AS 成型半检缺陷__缺陷汇总,
 								DECODE( NVL( f.成型半检缺陷__缺陷汇总, 0 ), 0, '0%', TO_CHAR( ( NVL( f.成型半检缺陷__缺陷汇总, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) AS 成型半检缺陷__缺陷率,
 								to_char(nvl(s.精修缺陷_打磨缺陷_糙活,0)) AS 精修缺陷_打磨缺陷_糙活,
@@ -456,7 +464,9 @@ DECODE( NVL( s.成型半检缺陷_水绺, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型
 DECODE( NVL( s.成型半检缺陷_裂, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_裂, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
 DECODE( NVL( s.成型半检缺陷_贴码不良, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_贴码不良, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
 DECODE( NVL( s.成型半检缺陷_干补不良, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_干补不良, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
-
+DECODE( NVL( s.成型半检缺陷_内漏不合格, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_内漏不合格, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
+DECODE( NVL( s.成型半检缺陷_外漏不合格, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_外漏不合格, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
+DECODE( NVL( s.成型半检缺陷_试水不合格, 0 ), 0, '0%', TO_CHAR( ( NVL( s.成型半检缺陷_试水不合格, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),
 f.成型半检缺陷__缺陷汇总,
 								DECODE( NVL( f.成型半检缺陷__缺陷汇总, 0 ), 0, '0%', TO_CHAR( ( NVL( f.成型半检缺陷__缺陷汇总, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) AS 成型半检缺陷__缺陷率,
 DECODE( NVL( s.精修缺陷_打磨缺陷_糙活, 0 ), 0, '0%', TO_CHAR( ( NVL( s.精修缺陷_打磨缺陷_糙活, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ),