生产数据表 试验线

wwwroot/mes/rpt2/rpt8001/rpt.ashx

@@ -134,7 +134,9 @@ WITH
 		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 (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( H.CREATETIME, 'YYYYMM' ), ( ) )
@@ -163,7 +165,9 @@ WITH
 		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 (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)
 		--AND S.SEMICHECKTYPE = 2 --1 返工 2 不合格
 		--AND S.RESEMICHECKTYPE = 0 --半检复检状态 (0：未复检、1：合格（返）、2：不合格（返）)
@@ -195,7 +199,9 @@ WITH
 		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 (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( S.SEMICHECKTIME, 'YYYYMM' ), ( ) )
@@ -224,7 +230,9 @@ WITH
 		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 (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)
 		--AND S.SEMICHECKTYPE = 2 --1 返工 2 不合格
 		--AND S.RESEMICHECKTYPE = 0 --半检复检状态 (0：未复检、1：合格（返）、2：不合格（返）)
@@ -255,7 +263,9 @@ WITH
 		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 (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)
 		--AND S.SEMICHECKTYPE = 2 --1 返工 2 不合格
 		--AND S.RESEMICHECKTYPE = 0 --半检复检状态 (0：未复检、1：合格（返）、2：不合格（返）)
@@ -290,7 +300,9 @@ WITH
 		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 (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.AUDITDATE, 'YYYYMM' ), ( ) )
@@ -323,7 +335,9 @@ WITH
 		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 (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.BACKOUTTIME, 'YYYYMM' ), ( ) )
@@ -352,7 +366,9 @@ WITH
 		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 (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' ), ( ) )
@@ -381,7 +397,9 @@ WITH
 		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 (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' ), ( ) )
@@ -415,7 +433,9 @@ WITH
 		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 (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' ), ( ) )
@@ -464,7 +484,9 @@ WITH
 		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 (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)) P
 	  GROUP BY
 		GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
@@ -497,7 +519,9 @@ WITH
 		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 (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' ), ( ) )
@@ -536,7 +560,9 @@ WITH
 		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 (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.BACKOUTTIME, 'YYYYMM' ), ( ) )
@@ -568,7 +594,9 @@ WITH
 		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 (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.AUDITDATE, 'YYYYMM' ), ( ) )
@@ -600,7 +628,9 @@ WITH
 		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 (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.BACKOUTTIME, 'YYYYMM' ), ( ) )
@@ -632,7 +662,9 @@ WITH
 		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 (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.AUDITDATE, 'YYYYMM' ), ( ) )
@@ -664,7 +696,9 @@ WITH
 		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 (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.BACKOUTTIME, 'YYYYMM' ), ( ) )
@@ -693,7 +727,9 @@ WITH
 		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 (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' ), ( ) )
@@ -722,7 +758,9 @@ WITH
 		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 (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' ), ( ) )
@@ -754,7 +792,9 @@ WITH
 	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 (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' ), ( ) )