工序 报表 中加入 出窑量和 缺陷数的 大小件合计

wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -262,9 +262,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                  ''  产品规格,
 	                                  ''  釉色,
 	                                  ''  商标,
-	                                  '' 出窑量,
-                                      '' 缺陷量,
-	                                  '' 缺陷率,
+	                                  TO_CHAR(COUNT(DISTINCT nvl(pds.productiondataid, pd.productiondataid))) 出窑量,
+                                    TO_CHAR(COUNT( DISTINCT CASE WHEN  (  MDF.DEFECTCODE in('01','02','03','04','05','06','07','08','09','10','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','001','002','099','99','1' ,'2' ,'3' ) ) AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN TO_CHAR(nvl(pds.productiondataid, pd.productiondataid)||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )) AS 缺陷量,
+	                                  TO_CHAR((COUNT( DISTINCT CASE WHEN  (  MDF.DEFECTCODE in('01','02','03','04','05','06','07','08','09','10','12','13','14','15','16','17','18','19','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','001','002','099','99','1' ,'2' ,'3' ) ) AND MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL THEN TO_CHAR(nvl(pds.productiondataid, pd.productiondataid)||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END  )/COUNT(DISTINCT nvl(pds.productiondataid, pd.productiondataid)) * 100), 'fm99990.00') || '%' 缺陷率,
                                 {DEFECTSUM}                              
     
                                 FROM

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -237,9 +237,9 @@ union ALL
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                             TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
+                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN pd.productiondataid||DF.BARCODE||DF.DEFECTCODE ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN pd.productiondataid||DF.BARCODE||DF.DEFECTCODE ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -240,9 +240,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                            TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+                              		TO_CHAR(COUNT( DISTINCT  CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23','25','35' ) THEN to_char(PD.productiondataid||DF.BARCODE||df.DEFECTCODE ) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23','25','35' ) THEN to_char(PD.productiondataid||DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -240,9 +240,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                             TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+									TO_CHAR(COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN (  '01', '02', '03', '04', '05', '06', '07', '08', '09', '10',  '28', '34', '35') THEN to_char(PD.productiondataid||DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) 缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10',  '28', '34', '35') THEN to_char(PD.productiondataid||DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -235,9 +235,9 @@ union ALL
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                             TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+									TO_CHAR(COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '36','37','38','39','40','41','42','43','44')  THEN to_char(PD.productiondataid||DF.BARCODE||MDF.DEFECTCODE ) ELSE NULL END )) 缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '36','37','38','39','40','41','42','43','44')  THEN to_char(PD.productiondataid||DF.BARCODE||MDF.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -240,9 +240,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                            TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+                                TO_CHAR(COUNT( DISTINCT CASE WHEN   df.DEFECTCODE IN ( '47','48','49','50','51','52','53','54','55','56','20','57')  THEN  to_char(PD.productiondataid||DF.BARCODE||DF.DEFECTID )ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN df.DEFECTCODE IN ( '47','48','49','50','51','52','53','54','55','56','20','57')   THEN to_char(PD.productiondataid||DF.BARCODE||DF.DEFECTID ) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -246,9 +246,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                            TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+									TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -249,9 +249,9 @@ union ALL
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                            TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+                               TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -249,9 +249,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ''  产品规格,
                             ''  釉色,
                             ''  商标,
-                            '' 出窑量,
-                            '' 缺陷量,
-                            '' 缺陷率,
+                           TO_CHAR(COUNT(DISTINCT PD.productiondataid)) 出窑量,
+                               TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(pd.productiondataid||DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,
                             {DEFECTSUM}  
                         FROM 
 	                            (SELECT DISTINCT pd.barcode

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -138,9 +138,9 @@ UNION ALL
 										''  产品规格,
 										''  釉色,
 										''  商标,
-										''  出窑量,
-										''  缺陷量,
-										''  缺陷率,
+										TO_CHAR(COUNT( DISTINCT PD.BARCODE)) 出窑量,
+	                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END ))缺陷量,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN TO_CHAR(DF.BARCODE||MDF.DEFECTCODE) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
 										TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '87' THEN 1 ELSE 0 END ) )  原料泥料料脏,
 										TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '88' THEN 1 ELSE 0 END ) ) 原料釉料铁脏,
 										TO_CHAR(SUM( CASE WHEN DF.DEFECTCODE = '086' THEN 1 ELSE 0 END ) ) 原料釉料铜脏,