个人 优等品 bug

库存  排序

wwwroot/mes/rpt/rpt211/rpt.ashx

@@ -176,9 +176,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     基础数据.釉色,
                     基础数据.商标,
                      TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid)) 出窑量,
-                    TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN 基础数据.productiondataid||基础数据.缺陷条码|| 基础数据.缺陷ID ELSE NULL END )) 优级品量,
-                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN 基础数据.productiondataid ||基础数据.缺陷条码|| 基础数据.缺陷ID ELSE NULL END)),0),0,'0%',
-	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN 基础数据.productiondataid ||基础数据.缺陷条码|| 基础数据.缺陷ID ELSE NULL END ) ) ,0 ) / 
+                    TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN  基础数据.缺陷条码  ELSE NULL END )) 优级品量,
+                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN 基础数据.缺陷条码 ELSE NULL END)),0),0,'0%',
+	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN  基础数据.缺陷条码 ELSE NULL END ) ) ,0 ) / 
 	DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
 					TO_CHAR(COUNT(distinct CASE WHEN   (基础数据.缺陷类别 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' )) THEN TO_CHAR(productiondataid||基础数据.缺陷条码|| 基础数据.缺陷ID) ELSE NULL END )) 缺陷量,
 					TO_CHAR( (COUNT(DISTINCT CASE WHEN   (基础数据.缺陷类别 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' )) THEN TO_CHAR(productiondataid||基础数据.缺陷条码|| 基础数据.缺陷ID) ELSE NULL END ) /COUNT(DISTINCT 基础数据.productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,

wwwroot/mes/rpt/rpt212/rpt.ashx

@@ -180,9 +180,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid)) 出窑量,
-										 TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53)  AND  基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.productiondataid||基础数据.缺陷条码||基础数据.DEFECTCODE ELSE NULL END )) 优级品量,
-                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53) AND    基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.productiondataid||基础数据.缺陷条码||基础数据.DEFECTCODE ELSE NULL END)),0),0,'0%',
-	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53)  AND  基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.productiondataid||基础数据.缺陷条码||基础数据.DEFECTCODE ELSE NULL END ) ) ,0 ) / 
+										 TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53)  AND  基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.缺陷条码 ELSE NULL END )) 优级品量,
+                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53) AND    基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.缺陷条码 ELSE NULL END)),0),0,'0%',
+	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 基础数据.PROCEDUREID IN (4,36,53)  AND  基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN 基础数据.缺陷条码 ELSE NULL END ) ) ,0 ) / 
 	DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
                                         
                                         TO_CHAR(COUNT( DISTINCT  CASE WHEN 基础数据.PROCEDUREID IN (4,36,53) AND 基础数据.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25', '35' ) THEN to_char(基础数据.productiondataid||基础数据.缺陷条码||基础数据.DEFECTCODE ) ELSE NULL END )) 缺陷量,

wwwroot/mes/rpt/rpt213/rpt.ashx

@@ -177,9 +177,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											TO_CHAR(基础数据.釉色)釉色,
 											TO_CHAR(基础数据.商标)商标,
 											TO_CHAR(COUNT(DISTINCT productiondataid)) 出窑量,
-											TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10','28', '34', '35') THEN productiondataid||基础数据.缺陷条码||基础数据.缺陷编码 ELSE NULL END )) 优级品量,
-                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35') THEN productiondataid||基础数据.缺陷条码||基础数据.缺陷编码 ELSE NULL END)),0),0,'0%',
-	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35') THEN productiondataid||基础数据.缺陷条码||基础数据.缺陷编码 ELSE NULL END ) ) ,0 ) / 
+											TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10','28', '34', '35') THEN 基础数据.缺陷条码 ELSE NULL END )) 优级品量,
+                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35') THEN 基础数据.缺陷条码 ELSE NULL END)),0),0,'0%',
+	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35') THEN 基础数据.缺陷条码 ELSE NULL END ) ) ,0 ) / 
 	DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
                                         
 											TO_CHAR(COUNT( DISTINCT  CASE WHEN 基础数据.PROCEDUREID IN (5,36,52) AND 基础数据.缺陷编码 IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35') THEN to_char(productiondataid||基础数据.缺陷条码||基础数据.缺陷编码 ) ELSE NULL END )) 缺陷量,

wwwroot/mes/rpt/rpt214/rpt.ashx

@@ -157,13 +157,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid)) 出窑量,
 										TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷id IS NOT NULL
                                                           AND 缺陷条码 IS NOT NULL THEN
-                                                      to_char(productiondataid || 缺陷条码 || 缺陷id) ELSE NULL END )) 优级品量,
+                                                      to_char(缺陷条码) ELSE NULL END )) 优级品量,
 										DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷id IS NOT NULL
                                                           AND 缺陷条码 IS NOT NULL THEN
-                                                      to_char(productiondataid || 缺陷条码 || 缺陷id) ELSE NULL END)),0),0,'0%',
+                                                      to_char(缺陷条码) ELSE NULL END)),0),0,'0%',
 											TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷id IS NOT NULL
                                                           AND 缺陷条码 IS NOT NULL THEN
-                                                      to_char(productiondataid || 缺陷条码 || 缺陷id) ELSE NULL END ) ) ,0 ) / 
+                                                      to_char(缺陷条码) ELSE NULL END ) ) ,0 ) / 
 											DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
 					
                                         to_char(COUNT(DISTINCT CASE

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -198,9 +198,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT productiondataid)) 出窑量,
-										TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 优级品量,
-                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END)),0),0,'0%',
-	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) ) ,0 ) / 
+										TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END )) 优级品量,
+                      DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END)),0),0,'0%',
+	TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END ) ) ,0 ) / 
 	DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
 					
 										TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -199,9 +199,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT productiondataid)) 出窑量,
-										TO_CHAR(COUNT(DISTINCT productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 优级品量,
-                      DECODE(NVL((COUNT( DISTINCT productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END)),0),0,'0%',
-	TO_CHAR((NVL((COUNT(DISTINCT productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID )ELSE NULL END ) ) ,0 ) / 
+										TO_CHAR(COUNT(DISTINCT productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END )) 优级品量,
+                      DECODE(NVL((COUNT( DISTINCT productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END)),0),0,'0%',
+	TO_CHAR((NVL((COUNT(DISTINCT productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 )ELSE NULL END ) ) ,0 ) / 
 	DECODE(NVL( COUNT( DISTINCT productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
 					
                                         TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -170,9 +170,9 @@ TO_CHAR(基础数据.工号) 工号,
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT(DISTINCT productiondataid)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid || 缺陷条码||缺陷ID ) ELSE NULL END )) 优级品量,
-                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid || 缺陷条码||缺陷ID ) ELSE NULL END)),0),0,'0%',
-	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid || 缺陷条码||缺陷ID ) ELSE NULL END ) ) ,0 ) / 
+                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END )) 优级品量,
+                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END)),0),0,'0%',
+	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END ) ) ,0 ) / 
 	                                    DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
                                         TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid || 缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
                                         TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -173,9 +173,9 @@ TO_CHAR(基础数据.工号) 工号,
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT( DISTINCT 基础数据.productiondataid)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 优级品量,
-                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END)),0),0,'0%',
-	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) ) ,0 ) / 
+                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END )) 优级品量,
+                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END)),0),0,'0%',
+	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN 缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END ) ) ,0 ) / 
 	                                    DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
                                          TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
                                         TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -175,9 +175,9 @@ TO_CHAR(基础数据.工号) 工号,
                                         TO_CHAR(基础数据.釉色)釉色,
                                         TO_CHAR(基础数据.商标)商标,
                                         TO_CHAR(COUNT( DISTINCT 基础数据.productiondataid)) 出窑量,
-                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 优级品量,
-                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END)),0),0,'0%',
-	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) ) ,0 ) / 
+                                        TO_CHAR(COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN   缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END )) 优级品量,
+                                        DECODE(NVL((COUNT( DISTINCT 基础数据.productiondataid ) - COUNT(DISTINCT CASE WHEN   缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END)),0),0,'0%',
+	                                    TO_CHAR((NVL((COUNT(DISTINCT 基础数据.productiondataid) - COUNT(DISTINCT CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(缺陷条码 ) ELSE NULL END ) ) ,0 ) / 
 	                                    DECODE(NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ),0,1,NVL( COUNT( DISTINCT 基础数据.productiondataid ), 1 ) ) ) * 100,'fm99990.00' ) || '%' ) AS 优级品率,
                                         TO_CHAR(COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END )) 缺陷量,
                                         TO_CHAR( (COUNT( DISTINCT  CASE WHEN  缺陷ID IS NOT NULL AND 缺陷条码 IS NOT NULL  THEN to_char(productiondataid||缺陷条码||缺陷ID ) ELSE NULL END ) /COUNT(DISTINCT productiondataid) * 100), 'fm99990.00') || '%' 缺陷率,

wwwroot/mes/rpt/rpt307/rpt.ashx

@@ -211,7 +211,7 @@ sum(case when OTHERID in( 9,8) then 1 else 0 end) 在产撤销清除  from TP_PM
                                         OR 施釉转出取消!=0 OR 精坯损失!=0 OR  精坯损失取消!=0 
                                         OR  实时精坯损失!=0 OR  实时施釉损失!=0 OR  在产清除转出!=0
                                         OR 在产撤销清除转入!=0 OR 施釉损失!=0 OR 施釉损失取消!=0 
-                                        OR 期末库存!=0  OR 实时精坯拉入量!=0 OR 实时施釉转出!=0  )";
+                                        OR 期末库存!=0  OR 实时精坯拉入量!=0 OR 实时施釉转出!=0  )  order by 产品编码   ,产品规格 ";
             }
             //获取查询条件
             List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt308/rpt.ashx

@@ -232,7 +232,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								))GROUP BY Grouping sets((产品编码,产品名称),())
 								) WHERE (期初库存<>0 OR 施釉转入<>0 OR 装车转出<>0 OR 釉坯损失<>0 OR 实时釉坯损失<>0 
 								OR 装车损失<>0 OR 实时装车损失<>0 OR 施釉转入取消<>0 OR 装车转出取消<>0 OR 釉坯损失取消<>0 OR 装车损失取消<>0 
-								OR 在产撤销清除转入<>0 OR 在产清除转出<>0  OR 期末库存<>0 OR 实时施釉转入<>0 OR 实时装车转出<>0 )
+								OR 在产撤销清除转入<>0 OR 在产清除转出<>0  OR 期末库存<>0 OR 实时施釉转入<>0 OR 实时装车转出<>0     ) order by 产品编码 
 								";
 			}
 			//获取查询条件