生产数据统计表

wwwroot/mes/rpt2/rpt8001/rpt.ashx

@@ -399,14 +399,26 @@ WITH
 		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
+		(SELECT *
+			FROM (SELECT PD.*,
+						RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
+					FROM TP_PM_PRODUCTIONDATA PD
+					INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
+					ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
+					WHERE PD.VALUEFLAG = '1'
+					AND PD.MODELTYPE IN (-1, -4, -5)
+					AND PD.CREATETIME >= @DATEBEGIN@ 
+					AND PD.CREATETIME < @DATEEND@ 
+					AND PD.GOODSLEVELTYPEID = 7
+					AND PD.ISREFIRE = 0) T
+			WHERE T.RK <= 1) P
 		INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 		INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
 	WHERE
 		P.CREATETIME >= @DATEBEGIN@
 		AND P.CREATETIME < @DATEEND@
-		AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
+		-- AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
 		AND P.GOODSLEVELTYPEID = 7 --产品分级类别 (1无缺陷、2有缺陷、3废品、4正品、5副品、6重烧、7次品、9干补)
 		AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0') 
 		AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0,0') 
@@ -432,14 +444,26 @@ WITH
 		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
+		(SELECT *
+			FROM (SELECT PD.*,
+						RANK() OVER(PARTITION BY PD.BARCODE, PD.KILNID ORDER BY PD.PRODUCTIONDATAID DESC) AS RK
+					FROM TP_PM_PRODUCTIONDATA PD
+					INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD
+					ON GDD.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID
+					WHERE PD.VALUEFLAG = '1'
+					AND PD.MODELTYPE IN (-1, -4, -5)
+					AND PD.CREATETIME >= @DATEBEGIN@ 
+					AND PD.CREATETIME < @DATEEND@ 
+					AND PD.GOODSLEVELTYPEID = 7
+					AND PD.ISREFIRE = 0) T
+			WHERE T.RK <= 1) P
 		INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 		INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 		INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
 	WHERE
 		P.BACKOUTTIME >= @DATEBEGIN@
 		AND P.BACKOUTTIME < @DATEEND@
-		AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
+		-- AND P.PROCEDUREID IN ( 12, 59, 105 ) --8-1质量登记 8-2重烧质量登记 3#质量登记
 		AND P.GOODSLEVELTYPEID = 7 --产品分级类别 (1无缺陷、2有缺陷、3废品、4正品、5副品、6重烧、7次品、9干补)
 		AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0') 
 		AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0,0')