生产数据统计表车间重写

wwwroot/mes/rpt2/rpt8001/rpt.ashx

@@ -76,44 +76,56 @@ WITH
 		NVL(TO_CHAR( H.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 注浆数_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 注浆数_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 1 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 1 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 注浆数_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 1 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 注浆数_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 注浆数_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 1 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数_三部全部,
 		SUM(DECODE(H.DATATYPE,1,1,0)) AS 注浆数_合计,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 注浆数撤销_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 注浆数撤销_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数撤销_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 2 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数撤销_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 2 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数撤销_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 注浆数撤销_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 2 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 注浆数撤销_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 注浆数撤销_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 注浆数撤销_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 2 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 注浆数撤销_三部全部,
 		SUM(DECODE(H.DATATYPE,2,1,0)) AS 注浆数撤销_合计,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 成型报损_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 成型报损_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 成型报损_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 3 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 3 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 成型报损_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 3 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 成型报损_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 成型报损_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 3 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 成型报损_三部全部,
 		COUNT(DECODE(H.DATATYPE,3,1,0)) AS 成型报损_合计,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 成型报损撤销_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 成型报损撤销_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 成型报损撤销_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 4 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损撤销_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 4 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损撤销_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 成型报损撤销_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 4 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 成型报损撤销_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 成型报损撤销_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 成型报损撤销_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 4 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 成型报损撤销_三部全部,
 		SUM(DECODE(H.DATATYPE,4,1,0)) AS 成型报损撤销_合计,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 入库数_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 入库数_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 入库数_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 51 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 51 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 入库数_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 51 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 入库数_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 入库数_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 51 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 入库数_三部全部,
 		SUM(DECODE(H.DATATYPE,51,1,0)) AS 入库数_合计,
 		
 		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 入库数撤销_一部大件,
-		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1))  THEN 1 ELSE 0 END ) AS 入库数撤销_一部小件,
-		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 入库数撤销_一部全部,
-		SUM(CASE WHEN ( H.DATATYPE = 52 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数撤销_二部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 52 AND ((INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数撤销_一部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1))) THEN 1 ELSE 0 END ) AS 入库数撤销_一部全部,
+		SUM(CASE WHEN ( H.DATATYPE = 52 AND ((INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 ))  THEN 1 ELSE 0 END ) AS 入库数撤销_二部大件,
+		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 入库数撤销_二部小件,
+		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1))) THEN 1 ELSE 0 END ) AS 入库数撤销_二部全部,
 		SUM(CASE WHEN ( H.DATATYPE = 52 AND (INSTR( GDD.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( gdd.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( GDD.GROUTINGLINECODE, 'C06B' ) = 1)) THEN 1 ELSE 0 END ) AS 入库数撤销_三部全部,
 		SUM(DECODE(H.DATATYPE,52,1,0)) AS 入库数撤销_合计
 		
@@ -144,9 +156,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( S.SEMICHECKTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( S.SEMICHECKTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_一部小件,
-		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 半检不合格_一部全部,
-		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_二部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_一部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 半检不合格_一部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_二部大件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_二部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 半检不合格_二部全部,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( S.GROUTINGLINECODE, 'A' ) = 4  OR INSTR( S.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 半检不合格_三部全部,
 		COUNT ( * ) AS 半检不合格_合计
 	FROM
@@ -177,9 +191,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( S.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( S.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_一部小件,
-		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 半检不合格_一部全部,
-		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_二部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_一部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 半检不合格_一部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半检不合格_二部大件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半检不合格_二部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 半检不合格_二部全部,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( S.GROUTINGLINECODE, 'A' ) = 4  OR INSTR( S.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 半检不合格_三部全部,
 		COUNT( * ) AS 半检不合格_合计 
 	FROM
@@ -209,9 +225,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( S.RESEMICHECKTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( S.RESEMICHECKTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_一部小件,
-		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 复检不合格_一部全部,
-		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_二部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_一部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 复检不合格_一部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_二部大件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_二部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 复检不合格_二部全部,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( S.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( S.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 复检不合格_三部全部,
 		COUNT ( * ) AS 复检不合格_合计
 	FROM
@@ -242,9 +260,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( S.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( S.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_一部小件,
-		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 复检不合格_一部全部,
-		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_二部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_一部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 复检不合格_一部全部,
+		SUM(CASE WHEN ((INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( S.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 复检不合格_二部大件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 复检不合格_二部小件,
+		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( S.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 复检不合格_二部全部,
 		SUM(CASE WHEN (INSTR( S.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( S.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( S.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 复检不合格_三部全部,
 		COUNT ( * ) AS 复检不合格_合计
 	FROM
@@ -275,9 +295,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.AUDITDATE, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.AUDITDATE, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 半成品损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 半成品损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 半成品损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 半成品损坯数_三部全部,
 		COUNT( * ) AS 合计 
 	FROM
@@ -310,9 +332,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 半成品损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 半成品损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 半成品损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 半成品损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 半成品损坯数_三部全部,
 		COUNT( * ) AS 合计 
 	FROM
@@ -345,9 +369,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 干补回收数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 干补回收数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 干补回收数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 干补回收数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 干补回收数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 干补回收数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 干补回收数_三部全部,
 		COUNT( * ) AS 干补回收数_合计
 	FROM
@@ -376,9 +402,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 干补回收数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 干补回收数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 干补回收数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 干补回收数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 干补回收数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 干补回收数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 干补回收数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 干补回收数_三部全部,
 		COUNT( * ) AS 干补回收数_合计
 	FROM
@@ -407,9 +435,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 出窑数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 出窑数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 出窑数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 出窑数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 出窑数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 出窑数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 出窑数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 出窑数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 出窑数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 出窑数_三部全部,
 		COUNT( * ) AS 出窑数_合计 
 	FROM
@@ -443,15 +473,19 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部大件,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部小件,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 质量登记次品数_一部全部,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部全部,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部小件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( P.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记次品数_一部全部,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部大件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( P.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部小件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( P.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记次品数_二部全部,
 		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 质量登记次品数_三部全部,
 		SUM( DECODE(P.ISREFIRE,0,1,0) ) AS 质量登记次品数_合计,
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部大件,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部小件,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部全部,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部小件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( P.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部全部,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( P.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部大件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( P.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部小件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( P.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登记次品数_三部全部,
 		SUM( DECODE(P.ISREFIRE,6,1,0) ) AS 重烧登记次品数_合计
 	  FROM (
@@ -494,9 +528,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 次品未判缺陷数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 次品未判缺陷数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 次品未判缺陷数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 次品未判缺陷数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 次品未判缺陷数_三部全部,
 		COUNT( * ) AS 次品未判缺陷数_合计
 	FROM
@@ -529,15 +565,19 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部大件,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部小件,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 质量登记次品数_一部全部,
-		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部全部,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_一部小件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记次品数_一部全部,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部大件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记次品数_二部小件,
+		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记次品数_二部全部,
 		SUM(CASE WHEN P.ISREFIRE = 0 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 质量登记次品数_三部全部,
 		SUM( DECODE(P.ISREFIRE,0,1,0) ) AS 质量登记次品数_合计,
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部大件,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部小件,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1) ) THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部全部,
-		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部小件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧登记次品数_一部全部,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部大件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部小件,
+		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧登记次品数_二部全部,
 		SUM(CASE WHEN P.ISREFIRE = 6 AND (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧登记次品数_三部全部,
 		SUM( DECODE(P.ISREFIRE,6,1,0) ) AS 重烧登记次品数_合计
 	FROM TP_PM_PRODUCTIONDATA P
@@ -570,9 +610,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.AUDITDATE, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.AUDITDATE, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 质量登记损坯数_三部全部,
 		COUNT( * ) AS 质量登记损坯数_数量 
 	FROM
@@ -604,9 +646,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 质量登记损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 质量登记损坯数_三部全部,
 		COUNT( * ) AS 质量登记损坯数_数量 
 	FROM
@@ -638,9 +682,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.AUDITDATE, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.AUDITDATE, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧损坯数_三部全部,
 		COUNT( * ) AS 重烧损坯数_数量 
 	FROM
@@ -672,9 +718,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.BACKOUTTIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 重烧损坯数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧损坯数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 重烧损坯数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 重烧损坯数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 重烧损坯数_三部全部,
 		COUNT( * ) AS 重烧损坯数_数量 
 	FROM
@@ -706,9 +754,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 回收数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 回收数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 回收数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 回收数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 回收数_三部全部,
 		COUNT( * ) AS 回收数_合计
 	FROM
@@ -737,9 +787,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 回收数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 回收数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 回收数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 回收数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 回收数_三部全部,
 		COUNT( * ) AS 回收数_合计
 	FROM
@@ -768,9 +820,11 @@ WITH
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 回收次品数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收次品数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 回收次品数_一部全部,
-		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收次品数_二部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收次品数_一部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 回收次品数_一部全部,
+		SUM(CASE WHEN ((INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR INSTR( P.GROUTINGLINECODE, 'D' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1 )  THEN 1 ELSE 0 END ) AS 回收次品数_二部大件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 回收次品数_二部小件,
+		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( P.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 回收次品数_二部全部,
 		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'C' ) = 1 AND INSTR( P.GROUTINGLINECODE, 'A' ) = 4 OR INSTR( P.GROUTINGLINECODE, 'C06B' ) = 1) THEN 1 ELSE 0 END ) AS 回收次品数_三部全部,
 		COUNT( * ) AS 回收次品数_合计
 	FROM
@@ -801,23 +855,55 @@ WITH
 	SELECT
 		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
 		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部大件,
-		SUM(CASE WHEN (INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部小件,
-		SUM(CASE WHEN (INSTR( P.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1 ) THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部全部,
-        SUM(CASE WHEN ((instr(p.groutinglinecode, 'B') = 1 OR instr(p.groutinglinecode, 'D') = 1) AND instr(gt.goodstypecode, '001001') = 1) THEN 1 ELSE  0 END) AS 裸瓷包装数_二部全部,
-        SUM(CASE WHEN (instr(p.groutinglinecode, 'C') = 1 AND instr(p.groutinglinecode, 'A') = 4 OR instr(p.groutinglinecode, 'C06B') = 1) THEN 1 ELSE 0 END) AS 裸瓷包装数_三部全部,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部大件,
+		SUM(CASE WHEN ((INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1) AND INSTR(GT.GOODSTYPECODE, '001002') = 1 )  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部小件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部全部,
+        SUM(CASE WHEN ((instr(GDD.groutinglinecode, 'B') = 1 OR instr(GDD.groutinglinecode, 'D') = 1) AND instr(gt.goodstypecode, '001001') = 1) THEN 1 ELSE  0 END) AS 裸瓷包装数_二部大件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 裸瓷包装数_二部小件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 裸瓷包装数_二部全部,
+        SUM(CASE WHEN (instr(GDD.groutinglinecode, 'C') = 1 AND instr(GDD.groutinglinecode, 'A') = 4 OR instr(GDD.groutinglinecode, 'C06B') = 1) THEN 1 ELSE 0 END) AS 裸瓷包装数_三部全部,
         COUNT(*) AS 裸瓷包装数_合计
 	FROM
-		TP_PM_PRODUCTIONDATA P
+		TP_PM_LCFHDO  P
 		INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = P.GROUTINGDAILYDETAILID
-		INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
+		INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
 		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
-		INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+		INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
 	WHERE
 	P.CREATETIME >= @DATEBEGIN@
-	AND P.CREATETIME < @DATEEND@
-	AND P.PROCEDUREID = 159
-	AND P.VALUEFLAG = 1  
+	AND P.CREATETIME < @DATEEND@ 
+	AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0') 
+	AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0,0') 
+	AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
+	--AND (GDD.TESTMOULDFLAG = @TESTMOULDFLAG@ OR @TESTMOULDFLAG@ IS NULL)
+		AND (((@TESTMOULDFLAG@ = 0 AND GDD.TESTMOULDFLAG  = @TESTMOULDFLAG@ AND (GDD.TESTFORMFLAG IN(0,1) OR GDD.TESTFORMFLAG IS NULL ) )) OR
+             (@TESTMOULDFLAG@ = 1 AND (GDD.TESTFORMFLAG = 2 OR GDD.TESTMOULDFLAG  = @TESTMOULDFLAG@))  OR @TESTMOULDFLAG@ IS NULL  OR @TESTMOULDFLAG@ = '') 
+	AND (GDD.TESTFLAG = @TESTFLAG@ OR @TESTFLAG@ IS NULL)
+	GROUP BY
+		GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
+),
+裸瓷包装撤销 AS
+(
+	SELECT
+		GROUPING_ID ( TO_CHAR( P.CREATETIME, 'YYYYMM' ) ) AS GID,
+		NVL(TO_CHAR( P.CREATETIME, 'YYYYMM' ),'合计') AS 时间,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1) AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部大件,
+		SUM(CASE WHEN ((INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1) AND INSTR(GT.GOODSTYPECODE, '001002') = 1 )  THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部小件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)) THEN 1 ELSE 0 END ) AS 裸瓷包装数_一部全部,
+        SUM(CASE WHEN ((instr(GDD.groutinglinecode, 'B') = 1 OR instr(GDD.groutinglinecode, 'D') = 1) AND instr(gt.goodstypecode, '001001') = 1) THEN 1 ELSE  0 END) AS 裸瓷包装数_二部大件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  THEN 1 ELSE 0 END ) AS 裸瓷包装数_二部小件,
+		SUM(CASE WHEN (INSTR( GDD.GROUTINGLINECODE, 'B' ) = 1 OR (INSTR( GDD.GROUTINGLINECODE, 'D' ) = 1 AND INSTR( GT.GOODSTYPECODE, '001001' ) = 1)) THEN 1 ELSE 0 END ) AS 裸瓷包装数_二部全部,
+        SUM(CASE WHEN (instr(GDD.groutinglinecode, 'C') = 1 AND instr(GDD.groutinglinecode, 'A') = 4 OR instr(GDD.groutinglinecode, 'C06B') = 1) THEN 1 ELSE 0 END) AS 裸瓷包装数_三部全部,
+        COUNT(*) AS 裸瓷包装数_合计
+	FROM
+		TP_PM_LCFHUNDO   P
+		INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = P.GROUTINGDAILYDETAILID
+		INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
+		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
+		INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
+	WHERE
+	P.CREATETIME >= @DATEBEGIN@
+	AND P.CREATETIME < @DATEEND@ 
 	AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0') 
 	AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0,0') 
 	AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
@@ -834,35 +920,47 @@ SELECT
 	NVL(注浆和成型报损和入库.注浆数_一部小件,0) - NVL(注浆和成型报损和入库.注浆数撤销_一部小件,0) AS 注浆数_一部小件,
 	NVL(注浆和成型报损和入库.注浆数_一部大件,0) - NVL(注浆和成型报损和入库.注浆数撤销_一部大件,0) AS 注浆数_一部大件,
 	NVL(注浆和成型报损和入库.注浆数_一部全部,0) - NVL(注浆和成型报损和入库.注浆数撤销_一部全部,0) AS 注浆数_一部全部,
+	NVL(注浆和成型报损和入库.注浆数_二部小件,0) - NVL(注浆和成型报损和入库.注浆数撤销_二部小件,0) AS 注浆数_二部小件,
+	NVL(注浆和成型报损和入库.注浆数_二部大件,0) - NVL(注浆和成型报损和入库.注浆数撤销_二部大件,0) AS 注浆数_二部大件,
 	NVL(注浆和成型报损和入库.注浆数_二部全部,0) - NVL(注浆和成型报损和入库.注浆数撤销_二部全部,0) AS 注浆数_二部全部,
 	NVL(注浆和成型报损和入库.注浆数_三部全部,0) - NVL(注浆和成型报损和入库.注浆数撤销_三部全部,0) AS 注浆数_三部全部,
 	NVL(注浆和成型报损和入库.成型报损_一部小件,0) - NVL(注浆和成型报损和入库.成型报损撤销_一部小件,0) AS 成型报损_一部小件,
 	NVL(注浆和成型报损和入库.成型报损_一部大件,0) - NVL(注浆和成型报损和入库.成型报损撤销_一部大件,0) AS 成型报损_一部大件,
 	NVL(注浆和成型报损和入库.成型报损_一部全部,0) - NVL(注浆和成型报损和入库.成型报损撤销_一部全部,0) AS 成型报损_一部全部,
+	NVL(注浆和成型报损和入库.成型报损_二部小件,0) - NVL(注浆和成型报损和入库.成型报损撤销_二部小件,0) AS 成型报损_二部小件,
+	NVL(注浆和成型报损和入库.成型报损_二部大件,0) - NVL(注浆和成型报损和入库.成型报损撤销_二部大件,0) AS 成型报损_二部大件,
 	NVL(注浆和成型报损和入库.成型报损_二部全部,0) - NVL(注浆和成型报损和入库.成型报损撤销_二部全部,0) AS 成型报损_二部全部,
 	NVL(注浆和成型报损和入库.成型报损_三部全部,0) - NVL(注浆和成型报损和入库.成型报损撤销_三部全部,0) AS 成型报损_三部全部,
 	
 	NVL(半检不合格.半检不合格_一部小件,0) - NVL(半检不合格撤销.半检不合格_一部小件,0) AS 半检不合格_一部小件,
 	NVL(半检不合格.半检不合格_一部大件,0) - NVL(半检不合格撤销.半检不合格_一部大件,0) AS 半检不合格_一部大件,
 	NVL(半检不合格.半检不合格_一部全部,0) - NVL(半检不合格撤销.半检不合格_一部全部,0) AS 半检不合格_一部全部,
+	NVL(半检不合格.半检不合格_二部小件,0) - NVL(半检不合格撤销.半检不合格_二部小件,0) AS 半检不合格_二部小件,
+	NVL(半检不合格.半检不合格_二部大件,0) - NVL(半检不合格撤销.半检不合格_二部大件,0) AS 半检不合格_二部大件,
 	NVL(半检不合格.半检不合格_二部全部,0) - NVL(半检不合格撤销.半检不合格_二部全部,0) AS 半检不合格_二部全部,
 	NVL(半检不合格.半检不合格_三部全部,0) - NVL(半检不合格撤销.半检不合格_三部全部,0) AS 半检不合格_三部全部,
 	
 	NVL(复检不合格.复检不合格_一部小件,0) - NVL(复检不合格撤销.复检不合格_一部小件,0) AS 复检不合格_一部小件,
 	NVL(复检不合格.复检不合格_一部大件,0) - NVL(复检不合格撤销.复检不合格_一部大件,0) AS 复检不合格_一部大件,
 	NVL(复检不合格.复检不合格_一部全部,0) - NVL(复检不合格撤销.复检不合格_一部全部,0) AS 复检不合格_一部全部,
+	NVL(复检不合格.复检不合格_二部小件,0) - NVL(复检不合格撤销.复检不合格_二部小件,0) AS 复检不合格_二部小件,
+	NVL(复检不合格.复检不合格_二部大件,0) - NVL(复检不合格撤销.复检不合格_二部大件,0) AS 复检不合格_二部大件,
 	NVL(复检不合格.复检不合格_二部全部,0) - NVL(复检不合格撤销.复检不合格_二部全部,0) AS 复检不合格_二部全部,
 	NVL(复检不合格.复检不合格_三部全部,0) - NVL(复检不合格撤销.复检不合格_三部全部,0) AS 复检不合格_三部全部,
 
 	NVL(半成品损坯数.半成品损坯数_一部小件,0) - NVL(半成品损坯数撤销.半成品损坯数_一部小件,0) AS 半成品损坯数_一部小件,
 	NVL(半成品损坯数.半成品损坯数_一部大件,0) - NVL(半成品损坯数撤销.半成品损坯数_一部大件,0) AS 半成品损坯数_一部大件,
 	NVL(半成品损坯数.半成品损坯数_一部全部,0) - NVL(半成品损坯数撤销.半成品损坯数_一部全部,0) AS 半成品损坯数_一部全部,
+	NVL(半成品损坯数.半成品损坯数_二部小件,0) - NVL(半成品损坯数撤销.半成品损坯数_二部小件,0) AS 半成品损坯数_二部小件,
+	NVL(半成品损坯数.半成品损坯数_二部大件,0) - NVL(半成品损坯数撤销.半成品损坯数_二部大件,0) AS 半成品损坯数_二部大件,
 	NVL(半成品损坯数.半成品损坯数_二部全部,0) - NVL(半成品损坯数撤销.半成品损坯数_二部全部,0) AS 半成品损坯数_二部全部,
 	NVL(半成品损坯数.半成品损坯数_三部全部,0) - NVL(半成品损坯数撤销.半成品损坯数_三部全部,0) AS 半成品损坯数_三部全部,
 	
 	NVL(干补回收数.干补回收数_一部小件,0) - NVL(干补回收数撤销.干补回收数_一部小件,0) AS 干补回收数_一部小件,
 	NVL(干补回收数.干补回收数_一部大件,0) - NVL(干补回收数撤销.干补回收数_一部大件,0) AS 干补回收数_一部大件,
 	NVL(干补回收数.干补回收数_一部全部,0) - NVL(干补回收数撤销.干补回收数_一部全部,0) AS 干补回收数_一部全部,
+	NVL(干补回收数.干补回收数_二部小件,0) - NVL(干补回收数撤销.干补回收数_二部小件,0) AS 干补回收数_二部小件,
+	NVL(干补回收数.干补回收数_二部大件,0) - NVL(干补回收数撤销.干补回收数_二部大件,0) AS 干补回收数_二部大件,
 	NVL(干补回收数.干补回收数_二部全部,0) - NVL(干补回收数撤销.干补回收数_二部全部,0) AS 干补回收数_二部全部,
 	NVL(干补回收数.干补回收数_三部全部,0) - NVL(干补回收数撤销.干补回收数_三部全部,0) AS 干补回收数_三部全部,
 	
@@ -870,58 +968,78 @@ SELECT
 	NVL( 出窑数.出窑数_一部小件, 0 ) AS 出窑数_一部小件,
 	NVL( 出窑数.出窑数_一部大件, 0 ) AS 出窑数_一部大件,
 	NVL( 出窑数.出窑数_一部全部, 0 ) AS 出窑数_一部全部,
+	NVL( 出窑数.出窑数_二部小件, 0 ) AS 出窑数_二部小件,
+	NVL( 出窑数.出窑数_二部大件, 0 ) AS 出窑数_二部大件,
 	NVL( 出窑数.出窑数_二部全部, 0 ) AS 出窑数_二部全部,
 	NVL( 出窑数.出窑数_三部全部, 0 ) AS 出窑数_三部全部,
 	
 	NVL(质量登记次品数.质量登记次品数_一部小件,0) - NVL(质量登记次品数改判.质量登记次品数_一部小件,0) AS 质量登记次品数_一部小件,
 	NVL(质量登记次品数.质量登记次品数_一部大件,0) - NVL(质量登记次品数改判.质量登记次品数_一部大件,0) AS 质量登记次品数_一部大件,
 	NVL(质量登记次品数.质量登记次品数_一部全部,0) - NVL(质量登记次品数改判.质量登记次品数_一部全部,0) AS 质量登记次品数_一部全部,
+	NVL(质量登记次品数.质量登记次品数_二部小件,0) - NVL(质量登记次品数改判.质量登记次品数_二部小件,0) AS 质量登记次品数_二部小件,
+	NVL(质量登记次品数.质量登记次品数_二部大件,0) - NVL(质量登记次品数改判.质量登记次品数_二部大件,0) AS 质量登记次品数_二部大件,
 	NVL(质量登记次品数.质量登记次品数_二部全部,0) - NVL(质量登记次品数改判.质量登记次品数_二部全部,0) AS 质量登记次品数_二部全部,
 	NVL(质量登记次品数.质量登记次品数_三部全部,0) - NVL(质量登记次品数改判.质量登记次品数_三部全部,0) AS 质量登记次品数_三部全部,
 	NVL(质量登记次品数.重烧登记次品数_一部小件,0) - NVL(质量登记次品数改判.重烧登记次品数_一部小件,0) AS 重烧登记次品数_一部小件,
 	NVL(质量登记次品数.重烧登记次品数_一部大件,0) - NVL(质量登记次品数改判.重烧登记次品数_一部大件,0) AS 重烧登记次品数_一部大件,
 	NVL(质量登记次品数.重烧登记次品数_一部全部,0) - NVL(质量登记次品数改判.重烧登记次品数_一部全部,0) AS 重烧登记次品数_一部全部,
+	NVL(质量登记次品数.重烧登记次品数_二部小件,0) - NVL(质量登记次品数改判.重烧登记次品数_二部小件,0) AS 重烧登记次品数_二部小件,
+	NVL(质量登记次品数.重烧登记次品数_二部大件,0) - NVL(质量登记次品数改判.重烧登记次品数_二部大件,0) AS 重烧登记次品数_二部大件,
 	NVL(质量登记次品数.重烧登记次品数_二部全部,0) - NVL(质量登记次品数改判.重烧登记次品数_二部全部,0) AS 重烧登记次品数_二部全部,
 	NVL(质量登记次品数.重烧登记次品数_三部全部,0) - NVL(质量登记次品数改判.重烧登记次品数_三部全部,0) AS 重烧登记次品数_三部全部,
 
 	NVL(次品未判缺陷数.次品未判缺陷数_一部小件,0)  AS 次品未判缺陷数_一部小件,
 	NVL(次品未判缺陷数.次品未判缺陷数_一部大件,0)  AS 次品未判缺陷数_一部大件,
 	NVL(次品未判缺陷数.次品未判缺陷数_一部全部,0)  AS 次品未判缺陷数_一部全部,
+	NVL(次品未判缺陷数.次品未判缺陷数_二部小件,0)  AS 次品未判缺陷数_二部小件,
+	NVL(次品未判缺陷数.次品未判缺陷数_二部大件,0)  AS 次品未判缺陷数_二部大件,
 	NVL(次品未判缺陷数.次品未判缺陷数_二部全部,0)  AS 次品未判缺陷数_二部全部,
 	NVL(次品未判缺陷数.次品未判缺陷数_三部全部,0)  AS 次品未判缺陷数_三部全部,
 
 	NVL(质量登记损坯数.质量登记损坯数_一部小件,0) - NVL(质量登记损坯数撤销.质量登记损坯数_一部小件,0) AS 质量登记损坯数_一部小件,
 	NVL(质量登记损坯数.质量登记损坯数_一部大件,0) - NVL(质量登记损坯数撤销.质量登记损坯数_一部大件,0) AS 质量登记损坯数_一部大件,
 	NVL(质量登记损坯数.质量登记损坯数_一部全部,0) - NVL(质量登记损坯数撤销.质量登记损坯数_一部全部,0) AS 质量登记损坯数_一部全部,
+	NVL(质量登记损坯数.质量登记损坯数_二部小件,0) - NVL(质量登记损坯数撤销.质量登记损坯数_二部小件,0) AS 质量登记损坯数_二部小件,
+	NVL(质量登记损坯数.质量登记损坯数_二部大件,0) - NVL(质量登记损坯数撤销.质量登记损坯数_二部大件,0) AS 质量登记损坯数_二部大件,
 	NVL(质量登记损坯数.质量登记损坯数_二部全部,0) - NVL(质量登记损坯数撤销.质量登记损坯数_二部全部,0) AS 质量登记损坯数_二部全部,
 	NVL(质量登记损坯数.质量登记损坯数_三部全部,0) - NVL(质量登记损坯数撤销.质量登记损坯数_三部全部,0) AS 质量登记损坯数_三部全部,
 	
 	NVL(重烧损坯数.重烧损坯数_一部小件,0) - NVL(重烧损坯数撤销.重烧损坯数_一部小件,0) AS 重烧损坯数_一部小件,
 	NVL(重烧损坯数.重烧损坯数_一部大件,0) - NVL(重烧损坯数撤销.重烧损坯数_一部大件,0) AS 重烧损坯数_一部大件,
 	NVL(重烧损坯数.重烧损坯数_一部全部,0) - NVL(重烧损坯数撤销.重烧损坯数_一部全部,0) AS 重烧损坯数_一部全部,
+	NVL(重烧损坯数.重烧损坯数_二部小件,0) - NVL(重烧损坯数撤销.重烧损坯数_二部小件,0) AS 重烧损坯数_二部小件,
+	NVL(重烧损坯数.重烧损坯数_二部大件,0) - NVL(重烧损坯数撤销.重烧损坯数_二部大件,0) AS 重烧损坯数_二部大件,
 	NVL(重烧损坯数.重烧损坯数_二部全部,0) - NVL(重烧损坯数撤销.重烧损坯数_二部全部,0) AS 重烧损坯数_二部全部,
 	NVL(重烧损坯数.重烧损坯数_三部全部,0) - NVL(重烧损坯数撤销.重烧损坯数_三部全部,0) AS 重烧损坯数_三部全部,
 	
 	NVL(回收数.回收数_一部小件,0) - NVL(回收数撤销.回收数_一部小件,0) AS 回收数_一部小件,
 	NVL(回收数.回收数_一部大件,0) - NVL(回收数撤销.回收数_一部大件,0) AS 回收数_一部大件,
 	NVL(回收数.回收数_一部全部,0) - NVL(回收数撤销.回收数_一部全部,0) AS 回收数_一部全部,
+	NVL(回收数.回收数_二部小件,0) - NVL(回收数撤销.回收数_二部小件,0) AS 回收数_二部小件,
+	NVL(回收数.回收数_二部大件,0) - NVL(回收数撤销.回收数_二部大件,0) AS 回收数_二部大件,
 	NVL(回收数.回收数_二部全部,0) - NVL(回收数撤销.回收数_二部全部,0) AS 回收数_二部全部,
 	NVL(回收数.回收数_三部全部,0) - NVL(回收数撤销.回收数_三部全部,0) AS 回收数_三部全部,
 
 	NVL(回收次品数.回收次品数_一部小件,0)  AS 回收次品数_一部小件,
 	NVL(回收次品数.回收次品数_一部大件,0)  AS 回收次品数_一部大件,
 	NVL(回收次品数.回收次品数_一部全部,0)  AS 回收次品数_一部全部,
+	NVL(回收次品数.回收次品数_二部小件,0)  AS 回收次品数_二部小件,
+	NVL(回收次品数.回收次品数_二部大件,0)  AS 回收次品数_二部大件,
 	NVL(回收次品数.回收次品数_二部全部,0)  AS 回收次品数_二部全部,
 	NVL(回收次品数.回收次品数_三部全部,0)  AS 回收次品数_三部全部,
 
 	NVL(注浆和成型报损和入库.入库数_一部小件,0) - NVL(注浆和成型报损和入库.入库数撤销_一部小件,0) AS 入库数_一部小件,
 	NVL(注浆和成型报损和入库.入库数_一部大件,0) - NVL(注浆和成型报损和入库.入库数撤销_一部大件,0) AS 入库数_一部大件,
 	NVL(注浆和成型报损和入库.入库数_一部全部,0) - NVL(注浆和成型报损和入库.入库数撤销_一部全部,0) AS 入库数_一部全部,
+	NVL(注浆和成型报损和入库.入库数_二部小件,0) - NVL(注浆和成型报损和入库.入库数撤销_二部小件,0) AS 入库数_二部小件,
+	NVL(注浆和成型报损和入库.入库数_二部大件,0) - NVL(注浆和成型报损和入库.入库数撤销_二部大件,0) AS 入库数_二部大件,
 	NVL(注浆和成型报损和入库.入库数_二部全部,0) - NVL(注浆和成型报损和入库.入库数撤销_二部全部,0) AS 入库数_二部全部,
 	NVL(注浆和成型报损和入库.入库数_三部全部,0) - NVL(注浆和成型报损和入库.入库数撤销_三部全部,0) AS 入库数_三部全部,
 
-	NVL(裸瓷包装数.裸瓷包装数_二部全部,0)  AS 裸瓷包装数_二部全部,
-	NVL(裸瓷包装数.裸瓷包装数_三部全部,0)  AS 裸瓷包装数_三部全部
+	NVL(裸瓷包装数.裸瓷包装数_二部小件,0)- NVL(裸瓷包装撤销.裸瓷包装数_二部小件,0)  AS 裸瓷包装数_二部小件,
+	NVL(裸瓷包装数.裸瓷包装数_二部大件,0)- NVL(裸瓷包装撤销.裸瓷包装数_二部大件,0)  AS 裸瓷包装数_二部大件,
+	NVL(裸瓷包装数.裸瓷包装数_二部全部,0)- NVL(裸瓷包装撤销.裸瓷包装数_二部全部,0)  AS 裸瓷包装数_二部全部,
+	NVL(裸瓷包装数.裸瓷包装数_三部全部,0)- NVL(裸瓷包装撤销.裸瓷包装数_三部全部,0)  AS 裸瓷包装数_三部全部
 FROM
 	拼接日期
 	LEFT JOIN 注浆和成型报损和入库 ON 拼接日期.时间 = 注浆和成型报损和入库.时间
@@ -945,6 +1063,7 @@ FROM
 	LEFT JOIN 回收次品数 ON 拼接日期.时间 = 回收次品数.时间
 	LEFT JOIN 次品未判缺陷数 ON 拼接日期.时间 = 次品未判缺陷数.时间
     LEFT JOIN 裸瓷包装数 ON 拼接日期.时间 = 裸瓷包装数.时间
+    LEFT JOIN 裸瓷包装撤销 ON 拼接日期.时间 = 裸瓷包装撤销.时间
 ORDER BY 
 	拼接日期.时间
                 ".Replace("YYYYMM",totalMaster)
@@ -977,7 +1096,7 @@ ORDER BY
                     DataRow dr = dt2.NewRow();
                     dr["部门序号"] = dt.Columns[j].ColumnName.Substring(dt.Columns[j].ColumnName.IndexOf("_")+1)
                             .Replace("一部小件","1").Replace("一部大件","2").Replace("一部全部","3")
-                            .Replace("二部全部","4").Replace("三部全部","5");
+                            .Replace("二部小件","4").Replace("二部大件","5").Replace("二部全部","6").Replace("三部全部","7");
                     dr["部门"] = dt.Columns[j].ColumnName.Substring(dt.Columns[j].ColumnName.IndexOf("_")+1);
                     dr["工序"] = dt.Columns[j].ColumnName.Substring(0, dt.Columns[j].ColumnName.IndexOf("_"));
                     for (int i = 0; i < dt.Rows.Count; i++)
@@ -1025,7 +1144,9 @@ ORDER BY
                         '测试子表1' AS 测试列2,
                         '测试子表1' AS 测试列3,
                         '测试子表1' AS 测试列4,
-                        '测试子表1' AS 测试列5
+                        '测试子表1' AS 测试列5,
+                        '测试子表1' AS 测试列6,
+                        '测试子表1' AS 测试列7
                     FROM 
                         DUAL
                 ";
@@ -1047,7 +1168,9 @@ ORDER BY
                         '测试子表2' AS 测试列2,
                         '测试子表2' AS 测试列3,
                         '测试子表2' AS 测试列4,
-                        '测试子表2' AS 测试列5
+                        '测试子表2' AS 测试列5,
+                        '测试子表1' AS 测试列6,
+                        '测试子表1' AS 测试列7
                     FROM 
                         DUAL
                 ";