Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/SANHOPE.mes.web

wwwroot/mes/rpt/rpt308/rpt.ashx

@@ -30,7 +30,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlStr = @"WITH 釉坯库入 AS (
 	SELECT
 		GOODSCODE,
-		COUNT( DISTINCT BARCODE ) 施釉转入 
+		COUNT( 1 ) 施釉转入 
 	FROM
 		TP_PM_PRODUCTIONDATA 
 WHERE CREATETIME>=@DATEBEGIN@  AND CREATETIME<=@DATEEND@ 
@@ -38,15 +38,36 @@ WHERE CREATETIME>=@DATEBEGIN@  AND CREATETIME<=@DATEEND@
 	GROUP BY
 		GOODSCODE 
 	),
+釉坯库入取消 AS (
+	SELECT
+		GOODSCODE,
+		COUNT(1 ) 施釉转入取消 
+	FROM
+		TP_PM_PRODUCTIONDATA 
+WHERE BACKOUTTIME>=@DATEBEGIN@  AND BACKOUTTIME<=@DATEEND@ 
+		AND PROCEDUREID = 11 
+	GROUP BY
+		GOODSCODE 
+	),
 	登窑 AS (
 	SELECT
 		GOODSCODE,
-		COUNT( DISTINCT BARCODE ) NUMS 
+		COUNT( 1 ) NUMS 
 	FROM
 		TP_PM_PRODUCTIONDATA 
 	WHERE CREATETIME>=@DATEBEGIN@  AND CREATETIME<=@DATEEND@ 
 		AND PROCEDUREID IN ( 55, 13 ) 
-		AND VALUEFLAG = 1 
+	GROUP BY
+		GOODSCODE 
+	),
+	登窑取消 AS (
+	SELECT
+		GOODSCODE,
+		COUNT( 1 ) NUMS 
+	FROM
+		TP_PM_PRODUCTIONDATA 
+	WHERE BACKOUTTIME>=@DATEBEGIN@  AND BACKOUTTIME<=@DATEEND@ 
+		AND PROCEDUREID IN ( 55, 13 ) 
 	GROUP BY
 		GOODSCODE 
 	),
@@ -57,8 +78,19 @@ WHERE CREATETIME>=@DATEBEGIN@  AND CREATETIME<=@DATEEND@
 	SUM( CASE WHEN PROCEDUREID = 11 THEN 1 ELSE 0 END ) 釉坯损失 
 FROM
 	TP_PM_SCRAPPRODUCT 
-  WHERE CREATETIME>=@DATEBEGIN@  AND CREATETIME<=@DATEEND@ 
-	AND VALUEFLAG = 1 
+  WHERE AUDITDATE>=@DATEBEGIN@  AND AUDITDATE<=@DATEEND@  and AUDITSTATUS=1 
+	AND GOODSLEVELTYPEID = 8 
+GROUP BY
+	GOODSCODE 
+	),
+	损坯取消 AS (
+	SELECT
+		GOODSCODE,
+	SUM( CASE WHEN PROCEDUREID IN ( 55, 13, 25 ) THEN 1 ELSE 0 END ) 装车损失取消,
+	SUM( CASE WHEN PROCEDUREID = 11 THEN 1 ELSE 0 END ) 釉坯损失取消 
+FROM
+	TP_PM_SCRAPPRODUCT 
+  WHERE BACKOUTTIME>=@DATEBEGIN@  AND BACKOUTTIME<=@DATEEND@ 
 	AND GOODSLEVELTYPEID = 8 
 GROUP BY
 	GOODSCODE 
@@ -71,11 +103,26 @@ GROUP BY
 											WHERE  PROCEDUREID=11 
 											AND BACKUPTIME=@DATEBEGIN@ 
 											GROUP BY GOODSCODE
-	) ,
+	),
+在产清除 AS (
+select 
+	TP_PM_GOODSCHANGEHISTORY.GOODSCODE,
+sum(case when OTHERID in(11,13,25,55)  then 1 else 0 end) 在产清除 from TP_PM_GOODSCHANGEHISTORY  LEFT JOIN TP_PM_GROUTINGDAILYDETAIL ON TP_PM_GROUTINGDAILYDETAIL.GROUTINGDAILYDETAILID = TP_PM_GOODSCHANGEHISTORY.GROUTINGDAILYDETAILID    where TP_PM_GOODSCHANGEHISTORY.DATATYPE=11  and TP_PM_GOODSCHANGEHISTORY.CREATETIME>=@DATEBEGIN@ and  TP_PM_GOODSCHANGEHISTORY.CREATETIME<=@DATEEND@ GROUP BY
+	TP_PM_GOODSCHANGEHISTORY.GOODSCODE
+),
+在产撤销清除 AS (
+	select 
+	TP_PM_GOODSCHANGEHISTORY.GOODSCODE,
+sum(case when OTHERID in(11,13,25,55) then 1 else 0 end) 在产撤销清除  from TP_PM_GOODSCHANGEHISTORY  LEFT JOIN TP_PM_GROUTINGDAILYDETAIL ON TP_PM_GROUTINGDAILYDETAIL.GROUTINGDAILYDETAILID = TP_PM_GOODSCHANGEHISTORY.GROUTINGDAILYDETAILID    where TP_PM_GOODSCHANGEHISTORY.DATATYPE=12  and TP_PM_GOODSCHANGEHISTORY.CREATETIME>=@DATEBEGIN@ and  TP_PM_GOODSCHANGEHISTORY.CREATETIME<=@DATEEND@ GROUP BY	
+	TP_PM_GOODSCHANGEHISTORY.GOODSCODE
+) ,
 	期末 AS (
 											SELECT GOODSCODE,COUNT( DISTINCT BARCODE)期末 FROM TP_PM_INPRODUCTION WHERE PROCEDUREID=11 AND VALUEFLAG=1
 											GROUP BY GOODSCODE
 											)
+
+
+
 	SELECT
 	* 
 	FROM(
@@ -83,19 +130,30 @@ GROUP BY
 												产品编码,产品名称,
 												SUM(期初库存)期初库存,
 												SUM(施釉转入)施釉转入,
-												SUM(转窑转入)转窑转入,
+												SUM(施釉转入取消)施釉转入取消,
 												SUM(装车转出)装车转出,
+												SUM(装车转出取消)装车转出取消,
 												SUM(釉坯损失)釉坯损失,
-												SUM(期末) 期末库存
+												SUM(釉坯损失取消)釉坯损失取消,
+												SUM(装车损失)装车损失,
+												SUM(装车损失取消)装车损失取消,
+												SUM(在产清除)在产清除转出,
+												SUM(在产撤销清除)在产撤销清除转入,
+												nvl(nvl(sum(期初库存),0) + nvl(sum(施釉转入),0)-nvl(sum(施釉转入取消),0) - nvl(SUM(装车转出),0)+nvl(SUM(装车转出取消),0)- nvl(SUM(装车损失),0)+nvl(SUM(装车损失取消),0)- nvl(SUM(在产清除),0)+nvl(SUM(在产撤销清除),0)- nvl(SUM(釉坯损失),0)+nvl(SUM(釉坯损失取消),0),0) 期末库存 
 												FROM(
 												SELECT
 												产品编码,产品名称,
 												期初库存,
 												施釉转入,
-												转窑转入,
+												施釉转入取消,
 												装车转出,
+												装车转出取消,
 												釉坯损失,
-											  NVL(期末, 0) 期末
+												釉坯损失取消,
+												装车损失,
+												装车损失取消,
+												在产清除,
+												在产撤销清除
 												FROM(
 	SELECT
 	good.GOODSCODE 产品编码,
@@ -104,22 +162,29 @@ GROUP BY
 	'' AS 窑号,
 	NVL(  期初.期初数量 , 0 ) AS 期初库存,
 	NVL( 釉坯库入.施釉转入, 0 ) AS 施釉转入,
-	0 AS 转窑转入,
+	NVL( 釉坯库入取消.施釉转入取消, 0 ) AS 施釉转入取消,
 	NVL( 登窑.NUMS , 0 ) AS 装车转出,
-	0 AS 转窑转出,
+	NVL( 登窑取消.NUMS , 0 ) AS 装车转出取消,
 	NVL( 损坯.釉坯损失 , 0 ) AS 釉坯损失 ,
-	期末.期末
+	NVL( 损坯取消.釉坯损失取消 , 0 ) AS 釉坯损失取消,
+	NVL( 损坯.装车损失 , 0 ) AS 装车损失 ,
+	NVL( 损坯取消.装车损失取消 , 0 ) AS 装车损失取消,
+	NVL( 在产清除 , 0 ) AS 在产清除 ,
+	NVL( 在产撤销清除 , 0 ) AS 在产撤销清除	
 FROM
 	TP_MST_GOODS good
-	LEFT JOIN 期末 on good.GOODSCODE=期末.GOODSCODE
-	LEFT JOIN 期初 ON 期初.产品编码 = good.GOODSCODE
-	LEFT JOIN 登窑 ON 登窑.GOODSCODE = good.GOODSCODE
-	LEFT JOIN 釉坯库入 ON 釉坯库入.GOODSCODE = good.GOODSCODE
-	LEFT JOIN 损坯 ON 损坯.GOODSCODE = good.GOODSCODE 
-
+	full JOIN 期初 ON 期初.产品编码 = good.GOODSCODE
+	full JOIN 登窑 ON 登窑.GOODSCODE = good.GOODSCODE
+	full JOIN 登窑取消 ON 登窑取消.GOODSCODE = good.GOODSCODE
+	full JOIN 釉坯库入 ON 釉坯库入.GOODSCODE = good.GOODSCODE
+	full JOIN 釉坯库入取消 ON 釉坯库入取消.GOODSCODE = good.GOODSCODE
+	full JOIN 损坯 ON 损坯.GOODSCODE = good.GOODSCODE 
+	full JOIN 损坯取消 ON 损坯取消.GOODSCODE = good.GOODSCODE 
+	full JOIN 在产清除 ON 在产清除.GOODSCODE = good.GOODSCODE 
+	full JOIN 在产撤销清除 ON 在产撤销清除.GOODSCODE = good.GOODSCODE 
 	))GROUP BY Grouping sets((产品编码,产品名称),())
-	)
-	WHERE (期初库存<>0 OR 施釉转入<>0 OR 转窑转入<>0  OR 装车转出<>0 OR 釉坯损失<>0 OR 期末库存<>0)";
+	) WHERE (期初库存<>0 OR 施釉转入<>0 OR 装车转出<>0 OR 釉坯损失<>0 OR 装车损失<>0 OR 施釉转入取消<>0 OR 装车转出取消<>0 OR 釉坯损失取消<>0 OR 装车损失取消<>0 OR 在产撤销清除转入<>0 OR 在产清除转出<>0  OR 期末库存<>0)
+	";
 			}
 			//获取查询条件
 			List<CDAParameter> sqlPara = new List<CDAParameter>();