2024-5-11 部分问题修改 更换导出方式

wwwroot/mes/rpt/rpt102/rpt.ashx

@@ -14,26 +14,26 @@ using DK.XuWei.WebMes;
 
 public class rpt : IHttpHandler, IReadOnlySessionState
 {
-	public void ProcessRequest(HttpContext context)
-	{
-		context.Response.ContentType = "text/plain";
+    public void ProcessRequest(HttpContext context)
+    {
+        context.Response.ContentType = "text/plain";
 
-		using (IDataAccess conn = DataAccess.Create())
-		{
-			//主表
-			if (context.Request["m"].ToString() == "master")
-			{
-				DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-				DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
-				string KilnID = context.Request["kilnidMaster"];
-				string sqlStr = "";
-				if (KilnID == "1")
-				{
-					sqlStr = @"SELECT
+        using (IDataAccess conn = DataAccess.Create())
+        {
+            //主表
+            if (context.Request["m"].ToString() == "master")
+            {
+                DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+                DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
+                string procedure = context.Request["procedureMaster"];
+                string sqlStr = "";
+                if (procedure == "本烧")
+                {
+                    sqlStr = @"SELECT
 *
 FROM(
 SELECT
-                                            '隧道窑 日合计' AS 窑炉,
+                                            '日合计' AS 窑炉,
                                             SUM(出窑量)AS 出窑量,
                                             SUM(产品产量) AS 产品产量,
                                             SUM(残品) AS 残品,
@@ -44,26 +44,26 @@ SELECT
                                             P.GOODSCODE AS GOODSCODE,
                                             UNITPRICE,
                                             SUM(CASE WHEN PROCEDUREID=16 THEN 1 ELSE 0 END)出窑量,
-                                            SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END)产品产量,
+                                            SUM(CASE WHEN GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
                                             SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
-                                             TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
+                                             TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
                                             FROM(
-                                            SELECT
+                                           SELECT
+																						DISTINCT
+																						PD.BARCODE,
                                             pd.PROCEDUREID,
                                             pd.GOODSLEVELTYPEID,
                                             pd.GOODSCODE AS GOODSCODE,
-                                            gd.UNITPRICE,
-                                            pd.KILNID,
-                                            pd.KILNNAME,
-											PD.ISREFIRE
+                                            gd.UNITPRICE
                                             FROM 
                                             TP_PM_PRODUCTIONDATA pd
                                             LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																						LEFT  JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE=PD.BARCODE AND PDS.PROCEDUREID=60
                                             WHERE pd.VALUEFLAG=1
                                             AND pd.CREATETIME>= @DATETIME@
-                                            AND pd.CREATETIME<= @dateEnd@
-                                            AND pd.PROCEDUREID IN(14,16)
-                                            AND pd.KILNID =1
+                                            AND pd.CREATETIME<=  @dateEnd@
+                                            AND pd.PROCEDUREID =16
+                                            
                                             )P
                                             GROUP BY  P.GOODSCODE,UNITPRICE
                                             )  
@@ -73,7 +73,7 @@ SELECT
                                             
                                             
                                             SELECT
-                                            '隧道窑 月度累计' AS 窑炉,
+                                            '月度累计' AS 窑炉,
                                             SUM(出窑量)AS 出窑量,
                                             SUM(产品产量) AS 产品产量,
                                             SUM(残品) AS 残品,
@@ -102,8 +102,8 @@ SELECT
                                             WHERE pd.VALUEFLAG=1
                                              AND pd.CREATETIME>=  (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25)
                                             AND pd.CREATETIME<= (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 24)+23/24 +59/(24*60)  
-                                            AND pd.PROCEDUREID IN(14,16)
-                                            AND pd.KILNID =1
+                                            AND pd.PROCEDUREID =16
+                                            
                                             )P
                                             GROUP BY  P.GOODSCODE,UNITPRICE
                                             ) 
@@ -177,8 +177,8 @@ WHERE
     pd.VALUEFLAG = 1
     AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
     AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
-    AND pd.PROCEDUREID IN(14,16)
-                                        AND pd.KILNID =1
+    AND pd.PROCEDUREID =16
+                                        
 
                                         )P
                                         GROUP BY  month_group,P.GOODSCODE,UNITPRICE
@@ -214,13 +214,18 @@ WHERE
                                         WHERE pd.VALUEFLAG=1
                                         AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
 																				AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
-                                        AND pd.PROCEDUREID IN(14,16)
-                                        AND pd.KILNID =1
+                                        AND pd.PROCEDUREID =16
+                                        
                                         )P
                                         GROUP BY  P.GOODSCODE,UNITPRICE
                                         )
 
-) ORDER BY DECODE(窑炉, '隧道窑 日合计', 1, '隧道窑 月度累计', 2),窑炉
+) ORDER BY DECODE(窑炉, '日合计', 1, '月度累计', 2),窑炉
+
+
+
+
+
 
 
 
@@ -232,13 +237,13 @@ WHERE
 
     ";
 
-                                        
-				}
-				if (KilnID == "2")
-				{
-					sqlStr = @"SELECT * FROM(
+
+                }
+                else if (procedure == "回烧")
+                {
+                    sqlStr = @"SELECT * FROM(
 SELECT
-                                        '梭式窑 日合计' AS 窑炉,
+                                        '日合计' AS 窑炉,
                                         SUM(出窑量)AS 出窑量,
                                         SUM(产品产量) AS 产品产量,
                                         SUM(残品) AS 残品,
@@ -254,20 +259,24 @@ SELECT
                                         DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
                                         FROM(
                                         SELECT
+																				DISTINCT
+																				PD.BARCODE,
                                         pd.PROCEDUREID,
                                         pd.GOODSLEVELTYPEID,
                                         pd.GOODSCODE AS GOODSCODE,
                                         gd.UNITPRICE,
                                         pd.KILNID,
                                         pd.KILNNAME
+																				
                                         FROM 
                                         TP_PM_PRODUCTIONDATA pd
                                         LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
                                         WHERE pd.VALUEFLAG=1
-                                         AND pd.CREATETIME>= @DATETIME@
+                                        AND pd.CREATETIME>= @DATETIME@
                                          AND pd.CREATETIME<=  @dateEnd@
-                                        AND pd.PROCEDUREID IN(26,28)
-                                        AND pd.KILNID =2
+                                        AND pd.PROCEDUREID = 28
+                                        
                                         )P
                                         GROUP BY  P.GOODSCODE,UNITPRICE
                                         )  
@@ -277,7 +286,7 @@ SELECT
                                         
                                         
                                         SELECT
-                                        '梭式窑 月度累计' AS 窑炉,
+                                        '月度累计' AS 窑炉,
                                         SUM(出窑量)AS 出窑量,
                                         SUM(产品产量) AS 产品产量,
                                         SUM(残品) AS 残品,
@@ -292,21 +301,25 @@ SELECT
                                         SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
                                         DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
                                         FROM(
-                                        SELECT
+                                       SELECT
+																				DISTINCT
+																				PD.BARCODE,
                                         pd.PROCEDUREID,
                                         pd.GOODSLEVELTYPEID,
                                         pd.GOODSCODE AS GOODSCODE,
                                         gd.UNITPRICE,
                                         pd.KILNID,
                                         pd.KILNNAME
+																				
                                         FROM 
                                         TP_PM_PRODUCTIONDATA pd
                                         LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
                                         WHERE pd.VALUEFLAG=1
                                         AND pd.CREATETIME>  (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25)
                                         AND pd.CREATETIME< (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 24)+23/24 +59/(24*60)  
-                                        AND pd.PROCEDUREID IN(26,28)
-                                        AND pd.KILNID =2
+                                        AND pd.PROCEDUREID = 28
+                                        
                                         )P
                                         GROUP BY  P.GOODSCODE,UNITPRICE
                                         )
@@ -329,37 +342,40 @@ SELECT
                                         DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
                                         FROM(
                                        SELECT
-    pd.PROCEDUREID,
-    pd.GOODSLEVELTYPEID,
-    pd.GOODSCODE AS GOODSCODE,
-    gd.UNITPRICE,
-    pd.KILNID,
-    pd.KILNNAME,
-    CASE 
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '1月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '2月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '3月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '4月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '5月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '6月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '7月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '8月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '9月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '10月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '11月'
-        WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '12月'
-    END AS month_group
-FROM 
-    TP_PM_PRODUCTIONDATA pd
-LEFT JOIN 
-    TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
-WHERE 
-    pd.VALUEFLAG = 1
-    AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
-    AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
-    AND pd.PROCEDUREID IN (26, 28)
-    AND pd.KILNID = 2
-
+																			 DISTINCT
+																				  PD.BARCODE,
+																					pd.PROCEDUREID,
+																					pd.GOODSLEVELTYPEID,
+																					pd.GOODSCODE AS GOODSCODE,
+																					gd.UNITPRICE,
+																					pd.KILNID,
+																					pd.KILNNAME,
+																					CASE 
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '1月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '2月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '3月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '4月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '5月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '6月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '7月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '8月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '9月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '10月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '11月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '12月'
+																					END AS month_group
+																			FROM 
+																					TP_PM_PRODUCTIONDATA pd
+																					INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
+																			LEFT JOIN 
+																					TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+																			WHERE 
+																					pd.VALUEFLAG = 1
+																					AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+																					AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+																					AND pd.PROCEDUREID = 28
+																					AND pd.KILNID = 2
+																			
                                         )P
                                         GROUP BY  month_group,P.GOODSCODE,UNITPRICE
                                         )
@@ -388,57 +404,250 @@ WHERE
                                         DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
                                         FROM(
                                         SELECT
+																				DISTINCT
+																				PD.BARCODE,
                                         pd.PROCEDUREID,
                                         pd.GOODSLEVELTYPEID,
                                         pd.GOODSCODE AS GOODSCODE,
                                         gd.UNITPRICE,
                                         pd.KILNID,
                                         pd.KILNNAME
+																				
                                         FROM 
                                         TP_PM_PRODUCTIONDATA pd
                                         LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
                                         WHERE pd.VALUEFLAG=1
                                         AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
 																				AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
-                                        AND pd.PROCEDUREID IN(26,28)
-                                        AND pd.KILNID =2
+                                        AND pd.PROCEDUREID = 28
+                                        
                                         )P
                                         GROUP BY  P.GOODSCODE,UNITPRICE
                                         )
-																				)ORDER BY DECODE(窑炉, '梭式窑 日合计', 1, '梭式窑 月度累计', 2),窑炉
+																				)ORDER BY DECODE(窑炉, '日合计', 1, '月度累计', 2),窑炉
+                    
                                         
 ";
-				}
+                }
+                else if (procedure == "冷修") {
+                    sqlStr = @"SELECT * FROM(
+SELECT
+                                        '日合计' AS 窑炉,
+                                        SUM(出窑量)AS 出窑量,
+                                        SUM(产品产量) AS 产品产量,
+                                        SUM(残品) AS 残品,
+                                        DECODE( NVL( SUM(产品产量), 0 ), 0, '0%', TO_CHAR( ( NVL( SUM(产品产量), 0 ) / DECODE( NVL( SUM(出窑量), 1 ), 0, 1, NVL( SUM(出窑量), 1 ) ) ) * 100, 'fm99990.00' ) || '%' )AS 合格率,		
+                                        SUM(产值)  AS 产值
+                                         FROM(
+                                        SELECT
+                                        P.GOODSCODE AS GOODSCODE,
+                                        UNITPRICE,
+                                        SUM(CASE WHEN PROCEDUREID=28 THEN 1 ELSE 0 END)出窑量,
+                                        SUM(CASE WHEN PROCEDUREID=28  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
+                                        SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
+                                        DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
+                                        FROM(
+                                        SELECT
+																				DISTINCT
+																				PD.BARCODE,
+                                        pd.PROCEDUREID,
+                                        pd.GOODSLEVELTYPEID,
+                                        pd.GOODSCODE AS GOODSCODE,
+                                        gd.UNITPRICE,
+                                        pd.KILNID,
+                                        pd.KILNNAME
+																				
+                                        FROM 
+                                        TP_PM_PRODUCTIONDATA pd
+                                        LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+                                        WHERE pd.VALUEFLAG=1
+                                        AND pd.CREATETIME>= @DATETIME@
+                                         AND pd.CREATETIME<=  @dateEnd@
+                                        AND pd.PROCEDUREID = 28
+                                        
+                                        )P
+                                        GROUP BY  P.GOODSCODE,UNITPRICE
+                                        )  
+                                        
+                                        
+                                        UNION ALL
+                                        
+                                        
+                                        SELECT
+                                        '月度累计' AS 窑炉,
+                                        SUM(出窑量)AS 出窑量,
+                                        SUM(产品产量) AS 产品产量,
+                                        SUM(残品) AS 残品,
+                                        DECODE( NVL( SUM(产品产量), 0 ), 0, '0%', TO_CHAR( ( NVL( SUM(产品产量), 0 ) / DECODE( NVL( SUM(出窑量), 1 ), 0, 1, NVL( SUM(出窑量), 1 ) ) ) * 100, 'fm99990.00' ) || '%' )AS 合格率,		
+                                        SUM(产值)  AS 产值
+                                         FROM(
+                                        SELECT
+                                        P.GOODSCODE AS GOODSCODE,
+                                        UNITPRICE,
+                                        SUM(CASE WHEN PROCEDUREID=28 THEN 1 ELSE 0 END)出窑量,
+                                        SUM(CASE WHEN PROCEDUREID=28  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
+                                        SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
+                                        DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
+                                        FROM(
+                                       SELECT
+																				DISTINCT
+																				PD.BARCODE,
+                                        pd.PROCEDUREID,
+                                        pd.GOODSLEVELTYPEID,
+                                        pd.GOODSCODE AS GOODSCODE,
+                                        gd.UNITPRICE,
+                                        pd.KILNID,
+                                        pd.KILNNAME
+																				
+                                        FROM 
+                                        TP_PM_PRODUCTIONDATA pd
+                                        LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+                                        WHERE pd.VALUEFLAG=1
+                                        AND pd.CREATETIME>  (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25)
+                                        AND pd.CREATETIME< (ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 24)+23/24 +59/(24*60)  
+                                        AND pd.PROCEDUREID = 28
+                                        
+                                        )P
+                                        GROUP BY  P.GOODSCODE,UNITPRICE
+                                        )
+																				UNION ALL
+                                          SELECT				
+																				TO_CHAR((EXTRACT(YEAR FROM SYSDATE) )||'-'||month_group||'累计'),
+                                        SUM(出窑量)AS 出窑量,
+                                        SUM(产品产量) AS 产品产量,
+                                        SUM(残品) AS 残品,
+                                        DECODE( NVL( SUM(产品产量), 0 ), 0, '0%', TO_CHAR( ( NVL( SUM(产品产量), 0 ) / DECODE( NVL( SUM(出窑量), 1 ), 0, 1, NVL( SUM(出窑量), 1 ) ) ) * 100, 'fm99990.00' ) || '%' )AS 合格率,		
+                                        SUM(产值)  AS 产值
+                                         FROM(
+                                        SELECT
+                                        P.GOODSCODE AS GOODSCODE,
+                                        UNITPRICE,
+																				month_group,
+                                        SUM(CASE WHEN PROCEDUREID=28 THEN 1 ELSE 0 END)出窑量,
+                                        SUM(CASE WHEN PROCEDUREID=28  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
+                                        SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
+                                        DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
+                                        FROM(
+                                       SELECT
+																			 DISTINCT
+																				  PD.BARCODE,
+																					pd.PROCEDUREID,
+																					pd.GOODSLEVELTYPEID,
+																					pd.GOODSCODE AS GOODSCODE,
+																					gd.UNITPRICE,
+																					pd.KILNID,
+																					pd.KILNNAME,
+																					CASE 
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '1月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'01-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '2月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'02-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '3月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'03-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '4月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'04-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '5月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'05-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '6月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'06-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '7月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'07-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '8月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'08-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '9月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'09-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '10月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'10-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '11月'
+																							WHEN pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'11-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss') AND pd.CREATETIME <= TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss') THEN '12月'
+																					END AS month_group
+																			FROM 
+																					TP_PM_PRODUCTIONDATA pd
+																					INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+																			LEFT JOIN 
+																					TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+																			WHERE 
+																					pd.VALUEFLAG = 1
+																					AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+																					AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+																					AND pd.PROCEDUREID = 28
+																					AND pd.KILNID = 2
+																			
+                                        )P
+                                        GROUP BY  month_group,P.GOODSCODE,UNITPRICE
+                                        )
+																				GROUP BY month_group 
+																				
+																				
+																				
+																				union ALL
+																				
+																				                  
+                                        
+                                        SELECT
+                                       (EXTRACT(YEAR FROM SYSDATE) )||'年度累计' AS 窑炉,
+                                        SUM(出窑量)AS 出窑量,
+                                        SUM(产品产量) AS 产品产量,
+                                        SUM(残品) AS 残品,
+                                        DECODE( NVL( SUM(产品产量), 0 ), 0, '0%', TO_CHAR( ( NVL( SUM(产品产量), 0 ) / DECODE( NVL( SUM(出窑量), 1 ), 0, 1, NVL( SUM(出窑量), 1 ) ) ) * 100, 'fm99990.00' ) || '%' )AS 合格率,		
+                                        SUM(产值)  AS 产值
+                                         FROM(
+                                        SELECT
+                                        P.GOODSCODE AS GOODSCODE,
+                                        UNITPRICE,
+                                        SUM(CASE WHEN PROCEDUREID=28 THEN 1 ELSE 0 END)出窑量,
+                                        SUM(CASE WHEN PROCEDUREID=28  AND GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END)产品产量,
+                                        SUM(CASE WHEN GOODSLEVELTYPEID in (6,7) THEN 1 ELSE 0 END)残品,
+                                        DECODE( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ), 0, 0, TO_CHAR( ( NVL( SUM(CASE WHEN  GOODSLEVELTYPEID in (4,5)  THEN 1 ELSE 0 END), 0 ) * UNITPRICE ) , 'fm9999999999999.00' )  ) AS 产值
+                                        FROM(
+                                        SELECT
+																				DISTINCT
+																				PD.BARCODE,
+                                        pd.PROCEDUREID,
+                                        pd.GOODSLEVELTYPEID,
+                                        pd.GOODSCODE AS GOODSCODE,
+                                        gd.UNITPRICE,
+                                        pd.KILNID,
+                                        pd.KILNNAME
+																				
+                                        FROM 
+                                        TP_PM_PRODUCTIONDATA pd
+                                        LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+                                        WHERE pd.VALUEFLAG=1
+                                        AND pd.CREATETIME >= TO_date((EXTRACT(YEAR FROM SYSDATE) - 1)||'-12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+																				AND pd.CREATETIME < TO_date((EXTRACT(YEAR FROM SYSDATE) )||'12-26 00:00:00', 'yyyy-mm-dd hh24:mi:ss')
+                                        AND pd.PROCEDUREID = 28
+                                        
+                                        )P
+                                        GROUP BY  P.GOODSCODE,UNITPRICE
+                                        )
+																				)ORDER BY DECODE(窑炉, '日合计', 1, '月度累计', 2),窑炉
+                    ";
+
+                }
 
-				//获取查询条件
-				List<CDAParameter> sqlPara = new List<CDAParameter>(); 
-				sqlPara.Add(new CDAParameter("DATETIME", dateBegin, DataType.DateTime));
+                //获取查询条件
+                List<CDAParameter> sqlPara = new List<CDAParameter>();
+                sqlPara.Add(new CDAParameter("DATETIME", dateBegin, DataType.DateTime));
                 sqlPara.Add(new CDAParameter("dateEnd", dateEnd, DataType.DateTime));
-				sqlPara.Add(new CDAParameter("KILNID", KilnID, DataType.Char));
-				//sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
-				//获取分页参数
-				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
-				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
-				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
+                //sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
+                //获取分页参数
+                int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
+                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
+                string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 
-				//获取分页数据    
-				int total = 0;
-				DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-                    /*删除列（通过列名称）*/
-                 dt.Columns.Remove("ROWNO");
+                //获取分页数据    
+                int total = 0;
+                DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                /*删除列（通过列名称）*/
+                dt.Columns.Remove("ROWNO");
 
-				string jsonStr = new JsonResult(dt) { total = total }.ToJson();
-				context.Response.Write(jsonStr);
-			}
-		}
-	}
+                string jsonStr = new JsonResult(dt) { total = total }.ToJson();
+                context.Response.Write(jsonStr);
+            }
+        }
+    }
 
-	public bool IsReusable
-	{
-		get
-		{
-			return false;
-		}
-	}
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
 }

wwwroot/mes/rpt/rpt102/rpt_index.html

@@ -26,8 +26,13 @@
                         <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
                         截止日期：
                         <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:180px; height:32px;">
-                        窑炉：
-                        <input class="easyui-combobox" id="kilnidMaster" name="kilnidMaster" data-options="required:true,prompt:'窑炉',tipPosition:'top',url:'../rpt.ashx?m=getKiln&select=1',method:'get',valueField:'KILNID',textField:'KILNNAME',panelHeight:'200px',editable:'true'" style="width:100px;height:32px;">
+                        数据源:
+                        <input class="easyui-combobox" id="procedureMaster" name="procedureMaster" data-options="required:true,prompt:'请选择...',tipPosition:'top',
+		   data:[
+		   {'text':'冷修','value':'冷修'},
+		   {'text':'回烧','value':'回烧'},
+		   {'text':'本烧','value':'本烧'},
+		   ],valueField:'value',textField:'text',panelHeight:'200px',editable:'true'" style="width:160px;height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -67,40 +72,27 @@
 
         //搜索提交
         function tbSearchSubmit() {
-            if ($("#kilnidMaster").combobox("getValue") != null && $("#kilnidMaster").combobox("getValue") != " " && $("#kilnidMaster").combobox("getValue") != "") {
-            $('#DataGridMaster').datagridLoad({
-                title: '',
-                idField: 'SID',
-                queryParams: $('#ffMaster').serializeJson(),
-                url: 'rpt.ashx?m=master&id=' + request('id'),
-                fixWidth: 160,
-                mergeWidth: 100,
-                splitChar: '_',
-                columnMenu: '#btnColumnMenu',
-                columnMoving: true,
-                pagination: true, pagelist: [10000, 50, 100, 50, 1000, 5000],
-                pageSize: 10000
+            if ($('#ffMaster').form("validate")) {
+                $('#DataGridMaster').datagridLoad({
+                    title: '',
+                    idField: 'SID',
+                    queryParams: $('#ffMaster').serializeJson(),
+                    url: 'rpt.ashx?m=master&id=' + request('id'),
+                    fixWidth: 160,
+                    mergeWidth: 100,
+                    splitChar: '_',
+                    columnMenu: '#btnColumnMenu',
+                    columnMoving: true,
+                    pagination: true,
+                    pagelist: [10000, 50, 100, 50, 1000, 5000],
+                    pageSize: 10000
+                })
 
-            });
-        } else {
-            $.messager.alert("提示", "请选择窑炉");
-        }
+            };
         }
         //导出
         function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
-
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(生产日进度报表).xls',
-                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(生产日进度报表)'
-            });
+            $('#DataGridMaster').datagrid('toExcel', '(生产日进度表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -75,12 +75,12 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(TP_MST_DataDictionary.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(logo.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                    TO_CHAR(COUNT( DISTINCT CASE WHEN  MDF.DEFECTTYPEID=1 AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN DF.BARCODE ELSE NULL END )) AS 缺陷量,
+                                                                      TO_CHAR(COUNT( DISTINCT CASE WHEN  MDF.DEFECTTYPEID=1 AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )) AS 缺陷量,
 	                                TO_CHAR((COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                              TP_PM_PRODUCTIONDATA PD
-                                  LEFT JOIN TP_PM_DEFECT df ON DF.PRODUCTIONDATAID=PD.PRODUCTIONDATAID AND DF.VALUEFLAG=1
+                                  LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
                                   LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND MDF.DEFECTTYPEID=1
                                   LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
                                   LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID

wwwroot/mes/rpt/rpt201/rpt_index.html

@@ -154,21 +154,11 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
+  
+            function tbExport() {
+                $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(成型)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
             }
-
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(成型)).xls',
-                workSheet: '成品质量分析日报表(成型)'
-            });
-        }
+        
 
         //搜索按钮
         function tbSearch() {

wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_'+ $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(半检)).xls',
-                workSheet: '成品质量分析日报表(半检)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(半检)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt203/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(打磨)).xls',
-                workSheet: '成品质量分析日报表(打磨)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(打磨)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt204/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue")+ '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(擦洗)).xls',
-                workSheet:'成品质量分析日报表(擦洗)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦洗)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt205/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(施釉)).xls',
-                workSheet: '成品质量分析日报表(施釉)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(施釉)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt206/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(擦坯)).xls',
-                workSheet: '成品质量分析日报表(擦坯)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦坯)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt207/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(装窑)).xls',
-                workSheet: '成品质量分析日报表(装窑)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(装窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt208/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
-                workSheet: '成品质量分析日报表(出窑)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(烧窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt209/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(出窑)).xls',
-                workSheet: '成品质量分析日报表(出窑)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(出窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({

wwwroot/mes/rpt/rpt210/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析日报表(原料)).xls',
-                workSheet: '成品质量分析日报表(原料)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(原料)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -33,9 +33,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID IN( '''||MDF.DEFECTID||''') THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID=2 ORDER BY  MDF.DEFECTCODE");
+														 FROM
+	                            TP_MST_DEFECT MDF 
+                            WHERE
+	                            MDF.DEFECTTYPEID = 1 
+	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
                     if (i > 0) defect += ",";
@@ -50,9 +52,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                              ELSE
                                     TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID IN( '''||MDF.DEFECTID||''') THEN 1 ELSE 0 END )) END' AS DEFECTCODE,
 	                            MDF.DEFECTNAME 
-															FROM TP_PC_DEFECTPROCEDUREJOBS JOBS
-															LEFT JOIN  TP_MST_DEFECT MDF  ON mdf.DEFECTID=JOBS.DEFECTID 
-															WHERE jobs.JOBSID=2 ORDER BY  MDF.DEFECTCODE");
+															 FROM
+	                            TP_MST_DEFECT MDF 
+                            WHERE
+	                            MDF.DEFECTTYPEID = 1 
+	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();
@@ -86,7 +90,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
                                         	AND MD.DICTIONARYTYPE = 'TPC002'
                                         	LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                        	LEFT JOIN TP_PM_DEFECT DF ON DF.PRODUCTIONDATAID = PD.PRODUCTIONDATAID AND DF.VALUEFLAG=1
+                                        	LEFT JOIN TP_PM_DEFECT DF ON DF.BARCODE = PD.BARCODE AND DF.VALUEFLAG=1
                                             LEFT JOIN TP_MST_DEFECT MDF ON MDF.DEFECTID=DF.DEFECTID AND MDF.VALUEFLAG=1 AND MDF.DEFECTTYPEID=1
                                         	LEFT JOIN TP_MST_USER us ON us.USERID=gdl.USERID
                                             
@@ -149,7 +153,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         基础数据.釉色,
                                         基础数据.商标,
                                         TO_CHAR(COUNT(DISTINCT 出窑条码)) 出窑量,
-                                        TO_CHAR(COUNT( DISTINCT CASE WHEN  缺陷类别 =1  THEN 缺陷条码 ELSE NULL END )) 缺陷量,
+                                       TO_CHAR(COUNT( DISTINCT CASE WHEN  缺陷类别 =1  THEN TO_CHAR(缺陷条码||基础数据.缺陷ID) ELSE NULL END )) 缺陷量,
                                            TO_CHAR( ((COUNT( DISTINCT CASE WHEN  缺陷类别 =1  THEN 缺陷条码 ELSE NULL END ))/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
                                         {DEFECT}
                                         FROM 基础数据

wwwroot/mes/rpt/rpt211/rpt_index.html

@@ -133,20 +133,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(注浆工个人质量分析报表（成型车间）).xls',
-                workSheet: '注浆工个人质量分析报表（成型车间)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(注浆工个人质量分析报表（成型车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt212/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(打磨工个人质量分析报表（精修车间）).xls',
-                workSheet: '打磨工个人质量分析报表（精修车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(打磨工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt213/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(刷洗工个人质量分析报表（精修车间）).xls',
-                workSheet: '刷洗工个人质量分析报表（精修车间)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(刷洗工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt214/rpt_index.html

@@ -83,20 +83,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(半检工个人质量分析报表（半检车间）).xls',
-                workSheet: '半检工个人质量分析报表（半检车间)'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(半检工个人质量分析报表（半检车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -62,7 +62,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         (
                                         SELECT
                                         		GDL.GROUTINGLINEID,
-                                        	PDC.USERCODE AS 工号,
+                                        	STF.STAFFCODE  AS 工号,
                                         	STF.STAFFNAME AS 姓名,GD.GOODSCODE AS 产品编码,
                                         	GD.GOODSNAME AS 产品名称,
                                         	GD.GOODSSPECIFICATION AS 产品规格,
@@ -96,7 +96,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         	 
                                         	AND PD.VALUEFLAG = 1
 										GROUP BY GDL.GROUTINGLINEID,
-                                        	PDC.USERCODE ,
+                                        	STF.STAFFCODE  ,
                                         	STF.STAFFNAME ,GD.GOODSCODE,
                                         	GD.GOODSNAME ,
                                         	GD.GOODSSPECIFICATION ,

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -85,15 +85,9 @@
         }
 
         //导出
+
         function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
-            $.dataGridToExcel(["DataGridMaster"], ["施釉工个人质量分析报表（施釉车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(施釉工个人质量分析报表（施釉车间）).xls');
+            $('#DataGridMaster').datagrid('toExcel', '(施釉工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -85,17 +85,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            var fileName = '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(擦坯工个人质量分析报表（施釉车间）).xls';
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $.dataGridToExcel(["DataGridMaster"], ["擦坯工个人质量分析报表（施釉车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(擦坯工个人质量分析报表（施釉车间）).xls');
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(擦坯工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -82,15 +82,9 @@
         }
 
         //导出
+
         function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
-            $.dataGridToExcel(["DataGridMaster"], ["装窑工个人质量分析报表（烧成车间）"], '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(装窑工个人质量分析报表（烧成车间）).xls');
+            $('#DataGridMaster').datagrid('toExcel', '(装窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -84,20 +84,9 @@
             });
         }
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工个人质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(烧窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -85,20 +85,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工个人质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工个人质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(出窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt220/rpt_index.html

@@ -85,20 +85,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间烧窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt221/rpt_index.html

@@ -85,20 +85,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧成车间出窑工质量分析报表).xls',
-                workSheet: '烧成车间出窑工质量分析报表'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间出窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt223/rpt_index.html

@@ -96,20 +96,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(月份成型车间缺陷发生率).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt224/rpt_index.html

@@ -91,20 +91,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(月份烧成车间质量缺陷表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt225/rpt_index.html

@@ -88,20 +88,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(烧窑工质量分析报表（烧成车间）).xls',
-                workSheet: '烧窑工质量分析报表（烧成车间）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(月份施釉车间缺陷分析表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt226/rpt.ashx

@@ -25,7 +25,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
                 DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
-             string defect = "";
+                string procedure = context.Request["procedureMaster"];
+                string defect = "";
+                string sqlStr = "";
                 DataTable dt = conn.ExecuteDatatable(@"SELECT  DISTINCT
 															 MDF.DEFECTID,
 	                            'TO_CHAR(SUM( CASE WHEN 基础数据.缺陷ID = '''||MDF.DEFECTID||''' THEN 1 ELSE 0 END )) ' AS DEFECTCODE,
@@ -38,37 +40,110 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     if (i > 0) defect += ",";
                     defect += dt.Rows[i]["DEFECTCODE"].ToString() + " " + dt.Rows[i]["DEFECTNAME"].ToString();
                 }
+                if (procedure == "回烧")
+                {
+                         sqlStr = @"WITH 部门 AS ( 
+                                        SELECT  GROUTINGLINEID,
+                                        CASE WHEN HIGHPRESSUREFLAG=1 THEN'高压' else TO_CHAR(SUBSTR(GROUTINGLINECODE, 1, 2)) END AS 部门
+                                        FROM  TP_PC_GROUTINGLINE
+                                        ),基础数据 AS 
+                                        (
+                                           SELECT
+                                                    GL.GROUTINGLINEID,
+                                                    PD.BARCODE 出窑条码,
+                                                    DF.BARCODE 缺陷条码,
+                                                    df.DEFECTID 缺陷ID,
+                                                    df.DEFECTCODE 缺陷编码,
+                                                    good.GOODSCODE AS 产品编码,
+                                                    good.GOODSNAME AS 产品名称,
+                                                    good.GOODSSPECIFICATION AS 产品规格,
+                                                    TP_MST_DataDictionary.DICTIONARYVALUE AS 釉色,
+                                                    logo.LOGONAME AS 商标,
+                                                    PD.USERCODE AS 工号,
+                                                    STF.STAFFNAME AS 姓名
+													FROM
+                                                    TP_PM_PRODUCTIONDATA pd
+                                                LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
+                                                LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
+                                                LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
+                                                LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
+												LEFT  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
+												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PDL.BARCODE AND DF.VALUEFLAG=1
+												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID
+                                                LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
+												LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PD.CLASSESSETTINGID
+                                                LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
+                                                WHERE PD.PROCEDUREID IN (28) AND PD.VALUEFLAG=1 AND PDL.BARCODE IS NOT NULL
+                                                   AND PD.CREATETIME >= @DATEBEGIN@
+                                                   AND PD.CREATETIME < @DATEEND@  AND PD.VALUEFLAG=1
+                                        )
+                                        
+                                        SELECT
+                                         GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标) AS GID,
+                                        CASE when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=127 THEN'总计'
+                                        	 when GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)=31 THEN'小计'ELSE NULL  END AS 统计方式,
+                                        TO_CHAR(基础数据.工号) AS 工号,
+                                        基础数据.姓名,
+										基础数据.产品编码,
+                                        基础数据.产品名称,
+                                        基础数据.产品规格,
+                                        基础数据.釉色,
+                                        基础数据.商标,
+                                        COUNT(DISTINCT 出窑条码) 出窑量,
+                                        COUNT(DISTINCT 缺陷条码) 缺陷量,
+                                        TO_CHAR( (COUNT(DISTINCT 缺陷条码)/COUNT(DISTINCT 出窑条码) * 100), 'fm99990.00') || '%' 缺陷率,
+										{DEFECT}
+                                        FROM 基础数据
+                                        LEFT JOIN 部门 ON 部门.GROUTINGLINEID=基础数据.GROUTINGLINEID
+                                        LEFT JOIN TP_MST_DEFECT MDF ON 基础数据.缺陷ID = MDF.DEFECTID 
+                                             GROUP BY
+													Grouping sets ( ( 
+																	基础数据.工号,
+																	基础数据.姓名,
+																	部门.部门,
+																	基础数据.产品编码,
+																	基础数据.产品名称,
+																	基础数据.产品规格,
+																	基础数据.釉色,
+																	基础数据.商标), (基础数据.工号,基础数据.姓名),() )
+																	ORDER BY 	基础数据.工号,基础数据.姓名,基础数据.产品名称,GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)
 
+".Replace("{DEFECT}", defect);
 
-                string sqlStr = @"WITH 部门 AS ( 
+                }
+                else if (procedure == "冷修") { 
+                     sqlStr = @"WITH 部门 AS ( 
                                         SELECT  GROUTINGLINEID,
                                         CASE WHEN HIGHPRESSUREFLAG=1 THEN'高压' else TO_CHAR(SUBSTR(GROUTINGLINECODE, 1, 2)) END AS 部门
                                         FROM  TP_PC_GROUTINGLINE
                                         ),基础数据 AS 
                                         (
-                                        SELECT
-                                                    GDL.GROUTINGLINEID,
+                                           SELECT
+                                                    GL.GROUTINGLINEID,
                                                     PD.BARCODE 出窑条码,
                                                     DF.BARCODE 缺陷条码,
                                                     df.DEFECTID 缺陷ID,
                                                     df.DEFECTCODE 缺陷编码,
-                                                    GD.GOODSCODE AS 产品编码,
-                                                    GD.GOODSNAME AS 产品名称,
-                                                    GD.GOODSSPECIFICATION AS 产品规格,
-                                                    MD.DICTIONARYVALUE AS 釉色,
-                                                    LG.LOGONAME AS 商标,
+                                                    good.GOODSCODE AS 产品编码,
+                                                    good.GOODSNAME AS 产品名称,
+                                                    good.GOODSSPECIFICATION AS 产品规格,
+                                                    TP_MST_DataDictionary.DICTIONARYVALUE AS 釉色,
+                                                    logo.LOGONAME AS 商标,
                                                     PD.USERCODE AS 工号,
                                                     STF.STAFFNAME AS 姓名
-                                                    FROM TP_PM_PRODUCTIONDATA PD
-                                                    LEFT JOIN TP_PM_DEFECT DF ON PD.PRODUCTIONDATAID = DF.PRODUCTIONDATAID   AND DF.VALUEFLAG=1
-                                                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GDL ON GDL.BARCODE = PD.BARCODE
-                                                    LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
-                                                    LEFT JOIN TP_MST_DataDictionary MD ON GD.GLAZETYPEID = MD.DICTIONARYID 
-                                                    AND MD.DICTIONARYTYPE = 'TPC002'
-                                                    LEFT JOIN TP_MST_LOGO LG ON PD.LOGOID = LG.LOGOID
-                                                    LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PD.CLASSESSETTINGID
-                                                    LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
-                                                    WHERE PD.PROCEDUREID=28
+													FROM
+                                                    TP_PM_PRODUCTIONDATA pd
+                                                LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
+                                                LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
+                                                LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
+                                                LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
+												LEFT  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PDL.BARCODE AND DF.VALUEFLAG=1
+												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID
+                                                LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
+												LEFT JOIN TP_PC_CLASSESDETAIL CLS ON CLS.CLASSESSETTINGID=PD.CLASSESSETTINGID
+                                                LEFT JOIN TP_HR_STAFF STF ON STF.STAFFID=CLS.STAFFID
+                                                WHERE PD.PROCEDUREID IN (28) AND PD.VALUEFLAG=1 AND PDL.BARCODE IS NOT NULL
                                                    AND PD.CREATETIME >= @DATEBEGIN@
                                                    AND PD.CREATETIME < @DATEEND@  AND PD.VALUEFLAG=1
                                         )
@@ -104,6 +179,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																	ORDER BY 	基础数据.工号,基础数据.姓名,基础数据.产品名称,GROUPING_ID(基础数据.工号,基础数据.姓名,部门.部门,基础数据.产品名称,基础数据.产品规格,基础数据.釉色,基础数据.商标)
 
 ".Replace("{DEFECT}", defect);
+                    
+                    }
+
+                
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
@@ -118,9 +197,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //获取分页数据    
                 int total = 0;
                 DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-                if (d != null && d.Rows.Count > 1) { 
-                                    d.Columns.Remove("GID");//移除GID列
-                    }
+                if (d != null && d.Rows.Count > 1) {
+                    d.Columns.Remove("GID");//移除GID列
+                }
                 string jsonStr = new JsonResult(d) { total = total }.ToJson();
                 context.Response.Write(jsonStr);
             }

wwwroot/mes/rpt/rpt226/rpt_index.html

@@ -28,6 +28,11 @@
                         <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
                         截止日期：
                         <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
+                        数据源:<input class="easyui-combobox" id="procedureMaster" name="procedureMaster" data-options="required:true,prompt:'请选择...',tipPosition:'top',
+		   data:[
+		   {'text':'冷修','value':'冷修'},
+		   {'text':'回烧','value':'回烧'},
+		   ],valueField:'value',textField:'text',panelHeight:'200px',editable:'true'" style="width:160px;height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>
@@ -85,20 +90,9 @@
         }
 
         //导出
-        function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
 
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(个人质量分析日报表（回烧修补工）).xls',
-                workSheet: '个人质量分析日报表（回烧修补工）'
-            });
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(个人质量分析日报表（回烧修补工）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt303/rpt_index.html

@@ -115,23 +115,11 @@
             });
         }
 
-		//导出
-		function tbExport() {
-			//加载表头
-			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
-			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
-			var fields = fields2.concat(fields1);
-			var headers = [];
-			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-				headers.push(fields[i]);
-			}
-				$('#DataGridMaster').datagridExport({
-					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(产品统计表).xls',
-                    workSheet: '产品统计表'
-				});
-		}
+        //导出
+
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(产品统计表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+        }
         //帮助事件
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -246,16 +246,15 @@ count( DISTINCT CASE WHEN df.DEFECTCODE IN ( '0100')  THEN DF.BARCODE ELSE NULL
 												Grouping sets ( ( gd.GOODSCODE, gd.GOODSNAME,gtp.GOODSTYPENAME ), ( gtp.GOODSTYPENAME) ,()) 
 								),
 								检验数 AS (		SELECT
-							 CASE WHEN  GROUPING_ID(pd.GOODSCODE,pd.GOODSTYPENAME) =2   THEN '小计'
+ CASE WHEN  GROUPING_ID(pd.GOODSCODE,pd.GOODSTYPENAME) =2   THEN '小计'
 												WHEN  GROUPING_ID(pd.GOODSCODE,pd.GOODSTYPENAME) =3   THEN '总计'ELSE to_char(pd.GOODSCODE) END AS GOODSCODE,
 									GROUPING_ID(pd.GOODSCODE,pd.GOODSTYPENAME) AS GID,
 									pd.GOODSNAME ,PD.GOODSTYPENAME,
 									COUNT( DISTINCT pd.BARCODE ) AS 检验量,
 									SUM( CASE WHEN PD.GOODSLEVELTYPEID IN ( 4, 5 ) THEN 1 ELSE 0 END ) AS 合格量,
 								SUM( CASE WHEN PD.GOODSLEVELTYPEID  NOT IN ( 4, 5 ) THEN 1 ELSE 0  END ) 残品 
-							FROM
-								(
-								SELECT
+FROM(
+SELECT
 	PRODUCTIONDATAID,BARCODE,GOODSCODE,GOODSLEVELTYPEID,REWORKPROCEDUREID ,GOODSNAME,GOODSTYPENAME,
 row_number() over (partition by BARCODE order by GOODSLEVELTYPEID DESC ) as rownums 
 	FROM(
@@ -280,12 +279,12 @@ row_number() over (partition by BARCODE order by GOODSLEVELTYPEID DESC ) as rown
 									AND PD.PROCEDUREID = 16 
 									AND PD.CREATETIME >= @DATEBEGIN@
 									AND PD.CREATETIME <=   @DATEEND@  
-									)
 
-								) PD
-								WHERE pd.rownums=1
-								GROUP BY
-									Grouping sets ( ( pd.GOODSCODE, pd.GOODSNAME,PD.GOODSTYPENAME ), (PD.GOODSTYPENAME),() ) 						),
+									)
+) pd
+WHERE rownums=1
+	GROUP BY
+									Grouping sets ( ( pd.GOODSCODE, pd.GOODSNAME,PD.GOODSTYPENAME ), (PD.GOODSTYPENAME),() ) 		),
 								产品 AS (
 								SELECT TO_CHAR(GOODSCODE) AS GOODSCODE,GOODSNAME,GOODSSPECIFICATION,gtp.GOODSTYPENAME FROM TP_MST_GOODS
 								LEFT JOIN TP_MST_GOODSTYPE gtp ON TP_MST_GOODS.GOODSTYPEID=gtp.GOODSTYPEID
@@ -432,10 +431,10 @@ row_number() over (partition by BARCODE order by GOODSLEVELTYPEID DESC ) as rown
 								TO_CHAR(nvl(s.原料缺陷_釉料缺陷_铁脏,0)) AS 原料缺陷_釉料缺陷_铁脏,
 								nvl(f.原料缺陷_缺陷汇总,0) AS 原料缺陷__缺陷汇总,
 								DECODE( NVL( f.原料缺陷_缺陷汇总, 0 ), 0, '0%', TO_CHAR( ( NVL( f.原料缺陷_缺陷汇总, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) AS 原料缺陷__缺陷率,
-								to_char(nvl(s.其他_隧道窑其他蹦脏,0)) AS 其他__隧道窑其他蹦脏,
-								to_char(nvl(s.其他_隧道窑其他试验不良,0)) AS 其他__隧道窑其他试验不良,
-								to_char(nvl(s.其他_梭式窑其他蹦脏,0)) AS 其他__梭式窑其他蹦脏,
-								to_char(nvl(s.其他_梭式窑其他试验不良,0)) AS 其他__梭式窑其他试验不良,
+								to_char(nvl(s.其他_隧道窑其他蹦脏,0)) AS 其他_隧道窑其他_蹦脏,
+								to_char(nvl(s.其他_隧道窑其他试验不良,0)) AS 其他_隧道窑其他_试验不良,
+								to_char(nvl(s.其他_梭式窑其他蹦脏,0)) AS 其他_梭式窑其他_蹦脏,
+								to_char(nvl(s.其他_梭式窑其他试验不良,0)) AS 其他_梭式窑其他_试验不良,
 								nvl(f.其他_缺陷汇总,0) AS 其他__缺陷汇总,
 								DECODE( NVL( f.其他_缺陷汇总, 0 ), 0, '0%', TO_CHAR( ( NVL( f.其他_缺陷汇总, 0 ) / DECODE( NVL( 检验数.检验量, 1 ), 0, 1, NVL( 检验数.检验量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) AS 其他__缺陷率
 								FROM 检验数

wwwroot/mes/rpt/rpt304/rpt_index.html

@@ -226,7 +226,7 @@
 
 		//导出
 		function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '_(卫生陶瓷欠点).xls');
+            $('#DataGridMaster').datagrid('toExcel', '(卫生陶瓷欠点).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") );
 		}
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -31,28 +31,31 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 if (procedure == "本烧")
                 {
                         sqlStr = @" WITH 数据源 AS ( SELECT
-                                                 CASE WHEN  GOODSCODE IS NULL  THEN '合计'  ELSE to_char(GOODSCODE) END AS 产品编码,
+                                                 CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
+													  WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
+												GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
                                                 GOODSSPECIFICATION 产品规格,
+												GOODSTYPENAME 产品类别,
                                                 COUNT(DISTINCT  BARCODE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID  IN (6,7,9) OR REWORKPROCEDUREID IN(24,42) THEN BARCODE ELSE NULL END) AS 出窑量_残品,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%A%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%B%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%C%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID NOT IN (1,2,3,4,5,6,7,8,9,10) THEN BARCODE ELSE NULL END) 其他缺陷
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID  IN (6,7,9) OR REWORKPROCEDUREID IN(24,42) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_残品,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 原料缺陷,
+                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%A%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%B%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   GROUTINGLINECODE LIKE '%C%' AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID NOT IN (1,2,3,4,5,6,7,8,9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
                                                 FROM(
                                                 SELECT
                                                 DISTINCT pd.BARCODE,
@@ -66,41 +69,43 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 DEFECT.DEFECTTYPEID,
                                                 DEFECT.DEFECTCODE,
                                                 GL.HIGHPRESSUREFLAG,REWORKPROCEDUREID,
-                                                pd.PROCEDUREID AS  PROCEDUREID
+                                                pd.PROCEDUREID AS  PROCEDUREID,
+												gtp.GOODSTYPENAME
                                                 FROM
                                                 TP_PM_PRODUCTIONDATA pd
-                                                LEFT JOIN TP_PM_DEFECT df ON DF.PRODUCTIONDATAID=PD.PRODUCTIONDATAID AND DF.VALUEFLAG=1 
-                                                LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1
+                                                LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
+												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1 
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
+												LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
                                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
                                                 LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
                                                 LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
-                                                WHERE PD.PROCEDUREID IN(16) AND PD.VALUEFLAG=1 AND pd.CREATETIME>=@DATEBEGIN@ AND pd.CREATETIME< @DATEEND@
+                                                WHERE PD.PROCEDUREID IN(16) AND PD.VALUEFLAG=1 AND pd.CREATETIME>= @DATEBEGIN@ AND pd.CREATETIME< @DATEEND@
                                                 )
                                                    
-                                                 GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION),())
+                                                 GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION,GOODSTYPENAME),(GOODSTYPENAME),())
                                                  ),
 													 工序对应出窑量 AS (
-																								 SELECT
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%A%'  THEN PD.BARCODE ELSE NULL END )) 成A出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%B%'  THEN PD.BARCODE ELSE NULL END )) 成B出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%C%'  THEN PD.BARCODE ELSE NULL END )) 成C出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  GL.HIGHPRESSUREFLAG =1  THEN PD.BARCODE ELSE NULL END )) 高压出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =4  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =5  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =6  THEN PD.BARCODE ELSE NULL END )) 半检出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 施釉出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 擦坯出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (55,13) THEN PD.BARCODE ELSE NULL END )) 装窑出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (57,39) THEN PD.BARCODE ELSE NULL END )) 烧窑出窑量,
-																												TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (56,14) THEN PD.BARCODE ELSE NULL END )) 卸窑出窑量
-																									FROM TP_PM_PRODUCTIONDATA PD
-																												INNER JOIN TP_PM_PRODUCTIONDATA pds on pds.BARCODE=pd.BARCODE 
-																												LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
-																												LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
-																												WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID=16
-																												AND PD.CREATETIME>=DATE'2024-4-29' 
+											    SELECT
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%A%'  THEN PD.BARCODE ELSE NULL END )) 成A出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%B%'  THEN PD.BARCODE ELSE NULL END )) 成B出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%C%'  THEN PD.BARCODE ELSE NULL END )) 成C出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  GL.HIGHPRESSUREFLAG =1  THEN PD.BARCODE ELSE NULL END )) 高压出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (4,36,53)  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (5,36,52)  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =6  THEN PD.BARCODE ELSE NULL END )) 半检出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 施釉出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 擦坯出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (55,13) THEN PD.BARCODE ELSE NULL END )) 装窑出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (57,39) THEN PD.BARCODE ELSE NULL END )) 烧窑出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (56,14) THEN PD.BARCODE ELSE NULL END )) 卸窑出窑量
+											    FROM TP_PM_PRODUCTIONDATA PD
+											    INNER JOIN TP_PM_PRODUCTIONDATA pds on pds.BARCODE=pd.BARCODE 
+											    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
+											    LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
+											    WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID=16
+											    AND pd.CREATETIME>= @DATEBEGIN@ AND pd.CREATETIME< @DATEEND@
 																								 )
                                                  SELECT
                                                  *
@@ -109,6 +114,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(产品编码) AS 产品编码,
                                         TO_CHAR(产品名称) AS 产品名称,
                                         TO_CHAR(产品规格) AS 产品规格,
+																				TO_CHAR(产品类别) AS 产品类别,
                                         TO_CHAR(釉色) AS 釉色,
                                         TO_CHAR(商标) AS 商标,
                                         TO_CHAR(出窑量_出窑量) AS 出窑量_出窑量,
@@ -131,6 +137,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         FROM 数据源
                                           UNION ALL                                    
                                 SELECT
+																DISTINCT
 	                                '出窑数',
 	                                '',
 	                                '',
@@ -138,7 +145,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                '',
 	                                '',
 	                                '',
-	                                '',
+	                                '','',
 	                                to_Char(出窑量_出窑量),	
 																	to_Char(成A出窑量),
 																	to_Char(成B出窑量),
@@ -156,7 +163,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 FROM
 	                                工序对应出窑量
 	                                LEFT JOIN 数据源 ON 1=1 
-	                                WHERE 产品编码 = '合计'
+	                                WHERE 数据源.GID=3
 
                                         UNION ALL 
                                      SELECT
@@ -167,7 +174,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       '',
                                       '',
                                       '',
-                                      '',
+                                      '','',
                                       DECODE( NVL(  数据源.原料缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(数据源.原料缺陷, 0 ) / DECODE( NVL( 数据源.出窑量_出窑量, 1 ), 0, 1, NVL(  数据源.出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.0' ) || '%' ) 原料缺陷,
 																			
                                       DECODE( NVL(  数据源.成型缺陷_成A, 0 ), 0, '0%', TO_CHAR( (    ( NVL(数据源.成型缺陷_成A, 0 ) / DECODE( NVL( 工序对应出窑量.成A出窑量, 1 ), 0, 1, NVL(  工序对应出窑量.成A出窑量, 1 ) ) ) ) * 100, 'fm99990.0' ) || '%' ) 成型缺陷_成A,
@@ -196,34 +203,37 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       DECODE( NVL(  数据源.其他缺陷, 0 ), 0, '0%',TO_CHAR( (    ( NVL(数据源.其他缺陷, 0 ) / DECODE( NVL( 数据源.出窑量_出窑量, 1 ), 0, 1, NVL(  数据源.出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.0' ) || '%' ) 其他缺陷
                                         FROM 数据源
 										LEFT JOIN 工序对应出窑量 ON 1=1
-                                        WHERE 数据源.产品编码='合计' )  ORDER BY 产品编码";
+                                        WHERE 数据源.GID=3 )  ORDER BY 产品类别,产品编码 ";
                 }
                 else if (procedure == "回烧")
                 {
                            sqlStr = @"  WITH 数据源 AS (SELECT
-                                                 CASE WHEN  GOODSCODE IS NULL  THEN '合计'  ELSE to_char(GOODSCODE) END AS 产品编码,
+                                                CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
+													WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
+													GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
                                                 GOODSSPECIFICATION 产品规格,
+																								GOODSTYPENAME 产品类别,
                                                 COUNT(DISTINCT LENGBUBARCOE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN    GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) AS 出窑量_残品,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 原料缺陷,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
                                                 COUNT(DISTINCT CASE WHEN    DEFECTCODE IN (SELECT DEFECTCODE  FROM TP_MST_DEFECT WHERE DEFECTTYPEID NOT IN(1,4,5,6,7,8)
-                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN BARCODE ELSE NULL END) 其他缺陷
+                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
                                                 FROM(
                                     SELECT
                                                 DISTINCT pd.BARCODE,
@@ -239,22 +249,24 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 DEFECT.DEFECTTYPEID,
                                                 DEFECT.DEFECTCODE,
                                                 GL.HIGHPRESSUREFLAG,
-                                                pd.PROCEDUREID AS PROCEDUREID
+                                                pd.PROCEDUREID AS PROCEDUREID,
+												gtp.GOODSTYPENAME
                                                 FROM
                                                 TP_PM_PRODUCTIONDATA pd
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
+																								LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
                                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
                                                 LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
 												LEFT  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
-												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PDL.BARCODE AND DF.VALUEFLAG=1
-												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID
+												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
+												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1 
                                                 LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
                                                 WHERE PD.PROCEDUREID IN (28) AND PD.VALUEFLAG=1 AND PDL.BARCODE IS NOT NULL
 												AND pd.CREATETIME>=@DATEBEGIN@ AND pd.CREATETIME< @DATEEND@
                                                 )
                                                    
-                                                 GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION),())
+                                                   GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION,GOODSTYPENAME),(GOODSTYPENAME),())
                                                  ),
 											工序对应出窑量 AS (
 											SELECT
@@ -262,8 +274,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%B%'  THEN PD.BARCODE ELSE NULL END )) 成B出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%C%'  THEN PD.BARCODE ELSE NULL END )) 成C出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  GL.HIGHPRESSUREFLAG =1  THEN PD.BARCODE ELSE NULL END )) 高压出窑量,
-											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =4  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
-											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =5  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
+											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (4,36,53)  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
+											    TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (5,36,52)  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =6  THEN PD.BARCODE ELSE NULL END )) 半检出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 施釉出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 擦坯出窑量,
@@ -285,6 +297,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(产品编码) AS 产品编码,
                                         TO_CHAR(产品名称) AS 产品名称,
                                         TO_CHAR(产品规格) AS 产品规格,
+										TO_CHAR(产品类别) AS 产品类别,
                                         TO_CHAR(釉色) AS 釉色,
                                         TO_CHAR(商标) AS 商标,
                                         TO_CHAR(出窑量_出窑量) AS 出窑量_出窑量,
@@ -314,7 +327,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                '',
 	                                '',
 	                                '',
-	                                '',
+	                                '','',
 	                                to_Char(出窑量_出窑量),	
 																	to_Char(成A出窑量),
 																	to_Char(成B出窑量),
@@ -332,7 +345,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 FROM
 	                                工序对应出窑量
 	                                LEFT JOIN 数据源 ON 1=1 
-	                                WHERE 产品编码 = '合计'
+	                                WHERE GID = 3
                                         UNION ALL 
                                         
                                     SELECT
@@ -343,7 +356,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       '',
                                       '',
                                       '',
-                                      '',
+                                      '','',
                                       DECODE( NVL(  原料缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(原料缺陷, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  成型缺陷_成A, 0 ), 0, '0%', TO_CHAR( (    ( NVL(成型缺陷_成A, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  成型缺陷_成B, 0 ), 0, '0%', TO_CHAR( (    ( NVL(成型缺陷_成B, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
@@ -359,33 +372,35 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       DECODE( NVL(  烧成窑缺陷_出窑, 0 ), 0, '0%', TO_CHAR( (    ( NVL(烧成窑缺陷_出窑, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  其他缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(其他缺陷, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) 
                                         FROM 数据源
-                                        WHERE 产品编码='合计' )  ORDER BY 产品编码";
+                                        WHERE GID=3 ) ORDER BY 产品类别,产品编码 ";
                 }
                 else if (procedure == "冷修") { 
                     sqlStr = @" WITH 数据源 AS (SELECT
-                                                 CASE WHEN  GOODSCODE IS NULL  THEN '合计'  ELSE to_char(GOODSCODE) END AS 产品编码,
+                                                  CASE WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =2   THEN '小计'
+													   WHEN  GROUPING_ID(GOODSCODE,GOODSTYPENAME) =3   THEN '总计'ELSE to_char(GOODSCODE) END AS 产品编码,
+												GROUPING_ID(GOODSCODE,GOODSTYPENAME) AS GID,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
                                                 DICTIONARYVALUE 釉色,
-                                                GOODSSPECIFICATION 产品规格,
+                                                GOODSSPECIFICATION 产品规格,GOODSTYPENAME 产品类别,
                                                 COUNT(DISTINCT LENGBUBARCOE ) as 出窑量_出窑量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
+                                                COUNT(DISTINCT CASE WHEN    GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
                                                 COUNT(DISTINCT CASE WHEN    GOODSLEVELTYPEID NOT IN (4,5) AND GOODSLEVELTYPEID IS NOT NULL   THEN BARCODE ELSE NULL END) AS 出窑量_残品,
                                                 COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
-                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN BARCODE ELSE NULL END) 烧成窑缺陷_装窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN BARCODE ELSE NULL END) 烧成窑缺陷_烧窑,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN BARCODE ELSE NULL END) 烧成窑缺陷_出窑,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成A,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成B,
+                                                COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_成C,
+                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_高压,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 成型缺陷_半检,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_施釉,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_擦坯,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=6 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_装窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=7 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_烧窑,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=8 THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 烧成窑缺陷_出窑,
                                                 COUNT(DISTINCT CASE WHEN    DEFECTCODE IN (SELECT DEFECTCODE  FROM TP_MST_DEFECT WHERE DEFECTTYPEID NOT IN(1,4,5,6,7,8)
-                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN BARCODE ELSE NULL END) 其他缺陷
+                                                AND DEFECTCODE NOT IN('10','12','13','14','15','16','17','18','19','20','01','02','03','04','05','06','07','08','09','10','25','34')) THEN to_char(BARCODE||DEFECTCODE) ELSE NULL END) 其他缺陷
                                                 FROM(
                                     SELECT
                                                 DISTINCT pd.BARCODE,
@@ -401,22 +416,24 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 DEFECT.DEFECTTYPEID,
                                                 DEFECT.DEFECTCODE,
                                                 GL.HIGHPRESSUREFLAG,
-                                                pd.PROCEDUREID AS PROCEDUREID
+                                                pd.PROCEDUREID AS PROCEDUREID,
+																								gtp.GOODSTYPENAME
                                                 FROM
                                                 TP_PM_PRODUCTIONDATA pd
                                                 LEFT JOIN TP_MST_GOODS good on good.GOODSID=PD.GOODSID
+																								LEFT JOIN TP_MST_GOODSTYPE gtp ON good.GOODSTYPEID=gtp.GOODSTYPEID
                                                 LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID=pd.LOGOID
                                                 LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
                                                 LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
 												INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
-												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PDL.BARCODE AND DF.VALUEFLAG=1
-												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID
+												LEFT JOIN TP_PM_DEFECT df ON DF.BARCODE=PD.BARCODE AND DF.VALUEFLAG=1
+												LEFT JOIN TP_MST_DEFECT DEFECT ON DEFECT.DEFECTID=DF.DEFECTID AND DEFECT.VALUEFLAG=1 
                                                 LEFT JOIN TP_MST_DataDictionary ON TP_MST_DataDictionary.DICTIONARYID=gd.GLAZETYPEID AND TP_MST_DataDictionary.DictionaryType = 'TPC002'
                                                 WHERE PD.PROCEDUREID IN (28) AND PD.VALUEFLAG=1 AND PDL.BARCODE IS NOT NULL
 												AND pd.CREATETIME>=@DATEBEGIN@ AND pd.CREATETIME< @DATEEND@
                                                 )
                                                    
-                                                 GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION),())
+                                                    GROUP BY Grouping sets((GOODSCODE ,GOODSNAME ,LOGONAME ,DICTIONARYVALUE,GOODSSPECIFICATION,GOODSTYPENAME),(GOODSTYPENAME),())
                                                  ),
 											工序对应出窑量 AS (
 											SELECT
@@ -424,8 +441,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%B%'  THEN PD.BARCODE ELSE NULL END )) 成B出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.GROUTINGLINECODE LIKE '%C%'  THEN PD.BARCODE ELSE NULL END )) 成C出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  GL.HIGHPRESSUREFLAG =1  THEN PD.BARCODE ELSE NULL END )) 高压出窑量,
-											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =4  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
-											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =5  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
+											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (4,36,53)  THEN PD.BARCODE ELSE NULL END )) 打磨出窑量,
+											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (5,36,52)  THEN PD.BARCODE ELSE NULL END )) 擦洗出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID =6  THEN PD.BARCODE ELSE NULL END )) 半检出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 施釉出窑量,
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (10,37,41)  THEN PD.BARCODE ELSE NULL END )) 擦坯出窑量,
@@ -434,7 +451,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											TO_CHAR(COUNT( DISTINCT CASE WHEN  PDS.PROCEDUREID IN (56,14) THEN PD.BARCODE ELSE NULL END )) 卸窑出窑量
 											FROM TP_PM_PRODUCTIONDATA PD
 											INNER JOIN TP_PM_PRODUCTIONDATA pds on pds.BARCODE=pd.BARCODE 
-                                            INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
+                                            INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
 											LEFT JOIN TP_PM_GROUTINGDAILYDETAIL gd ON gd.barcode=pd.barcode
 											LEFT JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID=gd.GROUTINGLINEID
 											WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID=28	
@@ -447,6 +464,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(产品编码) AS 产品编码,
                                         TO_CHAR(产品名称) AS 产品名称,
                                         TO_CHAR(产品规格) AS 产品规格,
+										TO_CHAR(产品类别) AS 产品类别,
                                         TO_CHAR(釉色) AS 釉色,
                                         TO_CHAR(商标) AS 商标,
                                         TO_CHAR(出窑量_出窑量) AS 出窑量_出窑量,
@@ -476,7 +494,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                '',
 	                                '',
 	                                '',
-	                                '',
+	                                '','',
 	                                to_Char(出窑量_出窑量),	
 																	to_Char(成A出窑量),
 																	to_Char(成B出窑量),
@@ -505,7 +523,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       '',
                                       '',
                                       '',
-                                      '',
+                                      '','',
                                       DECODE( NVL(  原料缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(原料缺陷, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  成型缺陷_成A, 0 ), 0, '0%', TO_CHAR( (    ( NVL(成型缺陷_成A, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  成型缺陷_成B, 0 ), 0, '0%', TO_CHAR( (    ( NVL(成型缺陷_成B, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
@@ -521,7 +539,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       DECODE( NVL(  烧成窑缺陷_出窑, 0 ), 0, '0%', TO_CHAR( (    ( NVL(烧成窑缺陷_出窑, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) ,
                                       DECODE( NVL(  其他缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(其他缺陷, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.00' ) || '%' ) 
                                         FROM 数据源
-                                        WHERE 产品编码='合计' )  ORDER BY 产品编码";
+                                        WHERE GID=3 )  ORDER BY 产品类别,产品编码 ";
                     }
                 //读取报表数据
              

wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -100,23 +100,11 @@
             };
         }
 
-		//导出
-		function tbExport() {
-			//加载表头
-			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
-			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
-			var fields = fields2.concat(fields1);
-			var headers = [];
-			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-				headers.push(fields[i]);
-			}
-				$('#DataGridMaster').datagridExport({
-					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'_(成品质量分析汇总表).xls',
-                    workSheet: '成品质量分析汇总表'
-				});
-		}
+        //导出
+
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析汇总表（此表包括冷修、重烧质量分析表）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+        }
 
 		//搜索按钮
 		function tbSearch() {

wwwroot/mes/rpt/rpt306/rpt.ashx

@@ -49,60 +49,51 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 SELECT 
 	GOODSCODE,USERID,COUNT(DISTINCT BARCODE) QICHU
 FROM
-	TP_PM_GROUTINGDAILYDETAIL_BACK_DAYS d
+	TP_PM_GROUTINGDAILYDETAIL d
 WHERE
 	NOT EXISTS ( SELECT BARCODE  FROM TP_PM_PRODUCTIONDATA p where d.BARCODE = p.BARCODE AND P.PROCEDUREID=3 )
 	GROUP BY USERID,GOODSCODE
 												)
 												
-												
+									
 												
 												SELECT
+													case WHEN GROUPING_ID(USERCODE,USERNAME,GOODSCODE,GOODSNAME,GOODSSPECIFICATION,	车间 )=62 THEN 
+													(
+															CASE
+														WHEN 车间= '1A' THEN
+														'成A' 
+														WHEN 车间= '1B' THEN
+														'成B' 
+														WHEN 车间= '1C' THEN
+														'成C' 
+														WHEN 车间= '1D' THEN
+														'成D' 
+														WHEN 车间= '8-' THEN
+														'高压' ELSE '' 
+													END  
+													)
+													
+															 WHEN GROUPING_ID(USERCODE,USERNAME,GOODSCODE,GOODSNAME,GOODSSPECIFICATION,	车间 )=63 THEN '总计' ELSE NULL END AS 统计方式,
 													USERCODE 工号,
 													USERNAME 姓名,
 													GOODSCODE 产品编码,
 													GOODSNAME 产品名称,
 													GOODSSPECIFICATION 产品规格,
-													模型设置数量,
-													应注模型数量,
-													期初,
-													注浆个数,
-													注浆损失,
-													( 注浆个数-注浆损失 ) 毛坯产量,
-													毛坯损失,
-													交坯个数,
-													( 期初 + 注浆个数 -注浆损失-毛坯损失-交坯个数 ) 期末,
-													DECODE(
-														NVL( 交坯个数, 0 ),
-														0,
-														'100%',
-														TO_CHAR(
-															( ( NVL( 交坯个数, 0 ) / DECODE( NVL( 注浆个数, 1 ), 0, 1, NVL( 注浆个数, 1 ) ) ) ) * 100,
-															'fm99990.00' 
-														) || '%' 
-													) 保坯率,
-													DECODE(
-														NVL( 应注模型数量, 0 ),
-														0,
-														'100%',
-														TO_CHAR(
-															( ( NVL( 应注模型数量, 0 ) / DECODE( NVL( 模型设置数量, 1 ), 0, 1, NVL( 模型设置数量, 1 ) ) ) ) * 100,
-															'fm99990.00' 
-														) || '%' 
+													sum(模型设置数量) 模型设置数量,
+													sum(应注模型数量) 应注模型数量,
+													sum(期初) 期初,
+													sum(注浆个数) 注浆个数,
+													sum(注浆损失) 注浆损失,
+													( sum(注浆个数)-sum(注浆损失) ) 毛坯产量,
+													SUM(毛坯损失) 毛坯损失,
+													SUM(交坯个数) 交坯个数,
+													( sum(期初) + sum(注浆个数) -sum(注浆损失)-SUM(毛坯损失)-SUM(交坯个数) ) 期末,
+													DECODE(NVL( SUM(交坯个数), 0 ),0,'100%',TO_CHAR(( ( NVL( SUM(交坯个数), 0 ) / DECODE( NVL( sum(注浆个数), 1 ), 0, 1, NVL( sum(注浆个数), 1 ) ) ) ) * 100,'fm99990.00' ) || '%' ) 保坯率,
+													DECODE(NVL( sum(应注模型数量), 0 ),0,'100%',TO_CHAR(( ( NVL( sum(应注模型数量), 0 ) / DECODE( NVL( sum(模型设置数量), 1 ), 0, 1, NVL( sum(模型设置数量), 1 ) ) ) ) * 100,'fm99990.00' ) || '%'
 													) 模型利用率,
-													DECODE(
-														1- NVL( 注浆损失, 0 ),
-														0,
-														'100%',
-														TO_CHAR(
-															( ( ( 注浆个数-注浆损失 ) / DECODE( NVL( 注浆个数, 1 ), 0, 1, NVL( 注浆个数, 1 ) ) ) ) * 100,
-															'fm99990.00' 
-														) || '%' 
-													) 注浆率,
-												--SUM( GROUTINGBATCHNO ) 注浆次数,
-													累计次数,
-													'' 组别,
-													'' 工作地点,
+													DECODE(1- NVL( SUM(毛坯损失), 0 ),0,'100%',TO_CHAR(( ( ( sum(注浆个数)-SUM(毛坯损失) ) / DECODE( NVL( sum(注浆个数), 1 ), 0, 1, NVL( sum(注浆个数), 1 ) ) ) ) * 100,'fm99990.00' ) || '%' ) 注浆率,
+													SUM(累计次数) 累计次数,'' 组别,'' 工作地点,
 												CASE
 														
 														WHEN 车间= '1A' THEN
@@ -157,23 +148,19 @@ WHERE
 													GOOD.GOODSSPECIFICATION --gdd.GROUTINGBATCHNO
 													
 													) 
-												GROUP BY
-													USERCODE,
+												GROUP BY Grouping sets ( (
+												USERCODE,
 													USERNAME,
 													GOODSCODE,
 													GOODSNAME,
-													GOODSSPECIFICATION,
-													模型设置数量,
-													应注模型数量,
-													注浆个数,
-													注浆损失,
-													毛坯损失,
-													交坯个数,
-													累计次数,
-													期初,
+													GOODSSPECIFICATION,				
 													车间 
+												),
+												(车间),()
+												)
+													
 												ORDER BY
-													USERCODE";
+												车间,USERCODE";
 			}
 			//获取查询条件
 			List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -96,23 +96,11 @@
             }
         }
 
-		//导出
-		function tbExport() {
-			//加载表头
-			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
-			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
-			var fields = fields2.concat(fields1);
-			var headers = [];
-			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-				headers.push(fields[i]);
-			}
-				$('#DataGridMaster').datagridExport({
-					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(成型注浆报表).xls',
-                    workSheet: '成型注浆报表'
-				});
-		}
+        //导出
+
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(成型注浆报表（结转时间为天）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+        }
 
 		//搜索按钮
 		function tbSearch() {

wwwroot/mes/rpt/rpt307/rpt_index.html

@@ -98,23 +98,11 @@
             }
         }
 
-		//导出
-		function tbExport() {
-			//加载表头
-			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
-			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
-			var fields = fields2.concat(fields1);
-			var headers = [];
-			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-				headers.push(fields[i]);
-			}
-				$('#DataGridMaster').datagridExport({
-					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(施釉精坯存量报表).xls',
-                    workSheet: '施釉精坯存量报表'
-				});
-		}
+        //导出
+
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(施釉精坯存量报表(结转周期天：精坯库出-釉坯库入)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+        }
         //帮助事件
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({

wwwroot/mes/rpt/rpt308/rpt_index.html

@@ -96,24 +96,11 @@
 
         }
 
-		//导出
-		function tbExport() {
-			//加载表头
-			var fields1 = $('#DataGridMaster').datagrid('getColumnFields');
-			var fields2 = $('#DataGridMaster').datagrid('getColumnFields', true);
-			var fields = fields2.concat(fields1);
-			var headers = [];
-			for (var i = 0; i < fields.length; i++) {
-				//headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-				headers.push(fields[i]);
-			}
-          
-				$('#DataGridMaster').datagridExport({
-					headers: headers,
-                    fileName: '导出数据_' + $("#datebeginMaster").datetimebox("getValue") + '_(烧成釉坯存量报表).xls',
-                    workSheet: '烧成釉坯存量报表'
-				});
-		}
+        //导出
+
+        function tbExport() {
+            $('#DataGridMaster').datagrid('toExcel', '(烧成釉坯存量报表（结转周期天：釉坯库入）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+        }
         //帮助事件
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({