出窑数更正

wwwroot/mes/rpt2/rpt8001/rpt.ashx

@@ -371,10 +371,12 @@ WITH
 	WHERE
 		P.CREATETIME >= @DATEBEGIN@
 		AND P.CREATETIME < @DATEEND@
+		AND P.ISREFIRE = '0'
+		AND P.islengbu = '0'
 		AND (
-			( P.PROCEDUREID = 11 AND P.VALUEFLAG = '1' ) -- 7-1成检出窑交接（用于一车间二车间）
-			OR ( P.PROCEDUREID = 104 AND P.ISREFIRE = '0' AND P.CHECKFLAG = '1' )  --3#成检交接（用于三车间）
-			) 
+		 ( P.PROCEDUREID = 11  AND (P.CHECKFLAG = '1' or P.CHECKFLAG is null) ) -- 7-1成检出窑交接（用于一车间二车间）
+			 OR ( P.PROCEDUREID = 104 AND P.CHECKFLAG = '1' )  --3#成检交接（用于三车间）
+		) 
 		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')