大字-总废品率取值：不按照缺陷代码限制，查全部

wwwroot/main/Procedure/test6/QualityBulletinBoardDataInfo.ashx

@@ -2244,19 +2244,15 @@ SELECT
 						(
 						SELECT
 							TO_CHAR( DEFECT.CREATETIME, 'yyyy-mm-dd' ) 时间,
-							--SUM(CASE WHEN MSTDEFECECTTYPE.DEFECTTYPEID = 1 AND DEFECT.DEFECTCODE IN ( '2', '1', '4', '3', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '18', '20', '21', '22', '24', '26', '32', '33', '35', '36', '37', '38', '39', '40', '41', '161', '42', '17', '34', '19') AND SUBSTR(DEFECT.DEFECTCODE, 0, 1) <> 0 AND MSTDEFECECTTYPE.DEFECTTYPEID = 1 THEN 1 ELSE 0 END) 成型数量
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '24',  '26', '32', '33', '34', '35', '36', '37', '38', '39', '40', '41',  '42', '43', '44', '45', '46', '47', '48', '49', '50') THEN 1 ELSE 0 END)+
-							--SUM(CASE WHEN MSTDEFECECTTYPE.DEFECTTYPEID = 1 THEN 1 ELSE 0 END) 成型数量,
-							--SUM(CASE WHEN DEFECT.DEFECTPROCEDUREID IN (44,6) AND SUBSTR(DEFECT.DEFECTCODE, 0, 1) <> 0 THEN 1 ELSE 0 END) 登装数量,
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '97', '98', '99', '100', '101', '102', '103', '104', '105', '106','107','108', '109', '110', '111', '112', '113', '114', '115', '116', '117', '118', '119', '120' ) THEN 1 ELSE 0 END) +
-							--SUM(CASE WHEN DEFECT.DEFECTPROCEDUREID IN (40,5,41,18)  AND SUBSTR(DEFECT.DEFECTCODE, 0, 1) <> 0 AND MSTDEFECECTTYPE.DEFECTTYPEID = 5 THEN 1 ELSE 0 END) 施釉数量,
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '89', '90', '91', '92','93', '94', '95','64', '65', '66', '67', '68', '69', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '81', '82', '83', '84', '85', '86' ) THEN 1 ELSE 0 END)+
-
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '62', '64','66') THEN 1 ELSE 0 END)+
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '25', '54', '55' ,'56') THEN 1 ELSE 0 END)+
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN (  '141', '142','146' ) THEN 1 ELSE 0 END)+
-
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '88', '136', '137', '138', '139', '143', '145' ) THEN 1 ELSE 0 END) AS 废品数
+							
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '24',  '26', '32', '33', '34', '35', '36', '37', '38', '39', '40', '41',  '42', '43', '44', '45', '46', '47', '48', '49', '50') THEN 1 ELSE 0 END)+
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '97', '98', '99', '100', '101', '102', '103', '104', '105', '106','107','108', '109', '110', '111', '112', '113', '114', '115', '116', '117', '118', '119', '120' ) THEN 1 ELSE 0 END) +
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '89', '90', '91', '92','93', '94', '95','64', '65', '66', '67', '68', '69', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '81', '82', '83', '84', '85', '86' ) THEN 1 ELSE 0 END)+
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '62', '64','66') THEN 1 ELSE 0 END)+
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '25', '54', '55' ,'56') THEN 1 ELSE 0 END)+
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN (  '141', '142','146' ) THEN 1 ELSE 0 END)+
+							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '88', '136', '137', '138', '139', '143', '145' ) THEN 1 ELSE 0 END) AS 废品数
+							COUNT(DISTINCT DEFECT.BARCODE) AS 废品数
 						FROM
 							TP_PM_DEFECT DEFECT
 							LEFT JOIN TP_PM_PRODUCTIONDATA PD ON DEFECT.PRODUCTIONDATAID = PD.PRODUCTIONDATAID