干补其他列数据 融合到干补列

wwwroot/main/Procedure/test6/QualityBulletinBoard.html

@@ -54,7 +54,6 @@
 					<td scope="col" class="text-center" style="width: 130px;">修坯</td>
 					<td scope="col" class="text-center" style="width: 130px;">一检撞伤</td>
 					<td scope="col" class="text-center" style="width: 130px;">锈点</td>
-					<td scope="col" class="text-center" style="width: 130px;">干补其他</td>
 					<td scope="col" class="text-center" style="width: 140px;">干补</td>
 				</tr>
 				<tr style="height: 47px;">
@@ -74,7 +73,6 @@
 					<td scope="col" class="text-center" id="sl13"></td>
 					<td scope="col" class="text-center" id="sl14"></td>
 					<td scope="col" class="text-center" id="sl15"></td>
-					<td scope="col" class="text-center" id="sl16"></td>
 					<td scope="col" class="text-center" id="sl17"></td>
 
 				</tr>
@@ -95,7 +93,6 @@
 					<td scope="col" class="text-center" id="qxl13"></td>
 					<td scope="col" class="text-center" id="qxl14"></td>
 					<td scope="col" class="text-center" id="qxl15"></td>
-					<td scope="col" class="text-center" id="qxl16"></td>
 					<td scope="col" class="text-center" id="qxl17"></td>
 
 				</tr>
@@ -116,7 +113,6 @@
 					<td scope="col" class="text-center" id="qsbw13" style="font-size: 12px;"></td>
 					<td scope="col" class="text-center" id="qsbw14" style="font-size: 12px;"></td>
 					<td scope="col" class="text-center" id="qsbw15" style="font-size: 12px;"></td>
-					<td scope="col" class="text-center" id="qsbw16" style="font-size: 12px;"></td>
 					<td scope="col" class="text-center" id="qsbw17" style="font-size: 12px;"></td>
 				</tr>
 				<tr style="height: 47px;">
@@ -127,7 +123,6 @@
 					<td scope="col" class="text-center" colspan="2" id="gxbll4"></td>
 					<td scope="col" class="text-center" colspan="2" id="gxbll5"></td>
 					<td scope="col" class="text-center" colspan="1" id="gxbll6"></td>
-					<td scope="col" class="text-center" colspan="1" id="gxbll7"></td>
 					<td scope="col" class="text-center" colspan="1" id="gxbll8"></td>
 				</tr>
 
@@ -139,7 +134,6 @@
 					<td scope="col" class="text-center" colspan="2" id="gxfpll4"></td>
 					<td scope="col" class="text-center" colspan="2" id="gxfpll5"></td>
 					<td scope="col" class="text-center" colspan="1" id="gxfpll6"></td>
-					<td scope="col" class="text-center" colspan="1" id="gxfpll7"></td>
 					<td scope="col" class="text-center" colspan="1" id="gxfpll8"></td>
 				</tr>
 			</thead>
@@ -293,7 +287,7 @@
 			var twoname = 'gxfpll';
             var table1 = document.getElementById('质量看板1');//获取table
             //循环列数量
-			for (var i = 1; i < 9; i++) {
+			for (var i = 1; i < 8; i++) {
 				var str1 = table1.rows[5].cells[i].innerHTML;//获取指定行列数据
                 var str2 = table1.rows[6].cells[i].innerHTML;
                 var first = str1.slice(0, -1);//截取掉最后百分比字符串
@@ -531,7 +525,6 @@
 					$('#sl13').text(json["rows"][0]["修坯"]);
 					$('#sl14').text(json["rows"][0]["一检撞伤"]);
 					$('#sl15').text(json["rows"][0]["锈点"]);
-					$('#sl16').text(json["rows"][0]["干补其他"]);
                     $('#sl17').text(json["rows"][0]["干补"]);
 
 
@@ -550,7 +543,6 @@
 					$('#qxl13').text(json["rows"][1]["修坯"]);
 					$('#qxl14').text(json["rows"][1]["一检撞伤"])
                     $('#qxl15').text(json["rows"][1]["锈点"]);
-                    $('#qxl16').text(json["rows"][1]["干补其他"]);
                     $('#qxl17').text(json["rows"][1]["干补"]);
                         
                     $('#qsbw1').text(json["rows"][2]["裂"]);
@@ -568,7 +560,6 @@
 					$('#qsbw13').text(json["rows"][2]["修坯"]);
 					$('#qsbw14').text(json["rows"][2]["一检撞伤"]);
                     $('#qsbw15').text(json["rows"][2]["锈点"]);
-                    $('#qsbw16').text(json["rows"][2]["干补其他"]);
 					$('#qsbw17').text(json["rows"][2]["干补"]);
 
                     $('#gxbll1').text(json["rows"][3]["裂"]);
@@ -577,7 +568,6 @@
 					$('#gxbll4').text(json["rows"][3]["上水"]);
 					$('#gxbll5').text(json["rows"][3]["修坯"]);
 					$('#gxbll6').text(json["rows"][3]["锈点"]);
-                    $('#gxbll7').text(json["rows"][3]["干补其他"]);
                     $('#gxbll8').text(json["rows"][3]["干补"]);
 
                     $('#gxfpll1').text(json["rows"][4]["裂"]);
@@ -586,7 +576,6 @@
 					$('#gxfpll4').text(json["rows"][4]["上水"]);
 					$('#gxfpll5').text(json["rows"][4]["修坯"]);
 					$('#gxfpll6').text(json["rows"][4]["锈点"]);
-                    $('#gxfpll7').text(json["rows"][4]["干补其他"]);
                     $('#gxfpll8').text(json["rows"][4]["干补"]);
                 }
             });

wwwroot/main/Procedure/test6/QualityBulletinBoardDataInfo.ashx

@@ -25,20 +25,16 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 						(
 						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', '25', '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','70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '81', '82', '83', '84', '85', '86' ,'88') THEN 1 ELSE 0 END) 施釉数量,
-							--SUM(CASE WHEN DEFECT.DEFECTPROCEDUREID IN (55,58,4,35)  AND SUBSTR(DEFECT.DEFECTCODE, 0, 1) <> 0 THEN 1 ELSE 0 END) 二检数量,
-							--SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '1', '3', '4', '5', '22', '33' ) THEN 1 ELSE 0 END) 二检数量,
+
 							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '62','63','64','66'  ) THEN 1 ELSE 0 END) 二检数量,
 							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '25', '54', '55' ,'56','57') 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 ( '145' ) THEN 1 ELSE 0 END) 其它数量,
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '147' ) THEN 1 ELSE 0 END) 干补其它数量
+							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '145','147' ) THEN 1 ELSE 0 END) 其它数量
 						FROM
 							TP_PM_DEFECT DEFECT
 							LEFT JOIN TP_PM_PRODUCTIONDATA PD ON DEFECT.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
@@ -48,8 +44,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							LEFT JOIN TP_MST_DEFECTTYPE MSTDEFECECTTYPE ON MSTDEFECECT.DEFECTTYPEID = MSTDEFECECTTYPE.DEFECTTYPEID
 						WHERE
 							TRUNC( DEFECT.CREATETIME ) = trunc(sysdate) 
-							--DEFECT.CREATETIME >= date'2022-08-12'
-							--AND DEFECT.CREATETIME < date'2022-08-13'
 							AND PD.VALUEFLAG = '1' --有效
 							AND DEFECT.VALUEFLAG = '1' --有效
 							AND SUBSTR( GDT.GOODSTYPECODE, 0, 6 ) = '001001' --大件
@@ -83,9 +77,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '54' ) THEN 1 ELSE 0 END ) 修坯,
 								SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '56' ) THEN 1 ELSE 0 END ) 一检撞伤,
 								SUM( CASE WHEN DEFECT.DEFECTCODE IN ('141','146' )THEN 1 ELSE 0 END ) 锈点,
-								SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '147' ) THEN 1 ELSE 0 END ) 干补其他,
-								SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '145' ) THEN 1 ELSE 0 END ) 干补,
-								--SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '144', '163', '162','133','137','138','139','140','143' ) THEN 1 ELSE 0 END ) 其它 
+								SUM( CASE WHEN DEFECT.DEFECTCODE IN ( '145','147' ) THEN 1 ELSE 0 END ) 干补,
 								SUM( CASE WHEN DEFECT.DEFECTCODE IN (  '136', '137','138','139','143') THEN 1 ELSE 0 END ) 其它 
 							FROM
 								TP_PM_DEFECT DEFECT
@@ -94,8 +86,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								LEFT JOIN TP_MST_GOODSTYPE GDT ON GD.GOODSTYPEID = GDT.GOODSTYPEID 
 							WHERE
 						 		TRUNC( DEFECT.CREATETIME ) = trunc(sysdate) 
-								--DEFECT.CREATETIME >= DATE'2022-08-12'
-								--AND DEFECT.CREATETIME < DATE'2022-08-13'
 								AND PD.ISREFIRE = 0 --非重烧
 								AND PD.VALUEFLAG = '1' --有效
 								AND GDT.GOODSTYPEID IN (4,6) --普通连体 智能连体
@@ -130,19 +120,16 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 						工序缺陷数量 AS (
 						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', '25', '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', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '81', '82', '83', '84', '85', '86' ,'88') THEN 1 ELSE 0 END) 施釉数量,
 							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '62','63', '64','66','65'  ) THEN 1 ELSE 0 END) 二检数量,
 							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '54', '55','56','57') THEN 1 ELSE 0 END) 一检数量,
 							SUM(CASE WHEN DEFECT.DEFECTCODE IN (  '141', '142','146' ) THEN 1 ELSE 0 END) 杂锈点数量, 
 						  --SUM(CASE WHEN DEFECT.DEFECTPROCEDUREID NOT IN (1,4,6,18,31,35,41,44,55,58,40,5) AND MSTDEFECECTTYPE.DEFECTTYPEID = 13 THEN 1 ELSE 0 END) 其它数量
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN (  '145' ) THEN 1 ELSE 0 END) 其它数量,
-							SUM(CASE WHEN DEFECT.DEFECTCODE IN ( '147' ) THEN 1 ELSE 0 END) 干补其它数量
+							SUM(CASE WHEN DEFECT.DEFECTCODE IN (  '145','147' ) THEN 1 ELSE 0 END) 其它数量
 						FROM
 							TP_PM_DEFECT DEFECT
 							LEFT JOIN TP_PM_PRODUCTIONDATA PD ON DEFECT.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
@@ -180,7 +167,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								TT14.修坯,
 								TT15.一检撞伤,
 								TT11.锈点,
-								TT12.干补其他,
 								TT13.干补
 							FROM 
 							--成型裂
@@ -741,49 +727,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 									ROWNUM <= 3 
 								) T11 
 							) TT11 ON 1 = 1
-							LEFT JOIN 
-							--干补其他
-							(
-								SELECT
-									LISTAGG ( T12.前三部位 ) within GROUP ( ORDER BY T12.数量 DESC ) 干补其他 
-								FROM
-								(
-									SELECT
-										T.位置 || '(' || T.数量 || ')' AS 前三部位,
-										T.数量
-									FROM
-									(
-										SELECT
-											TMDPI.DEFECTPOSITIONNAME AS 位置,
-											COUNT( * ) AS 数量 
-										FROM
-											TP_PM_DEFECT TMDP
-											LEFT JOIN TP_MST_DEFECTPOSITION TMDPI ON TMDP.DEFECTPOSITIONID = TMDPI.DEFECTPOSITIONID
-											LEFT JOIN TP_PM_PRODUCTIONDATA PD ON TMDP.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
-											LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
-											LEFT JOIN TP_MST_GOODSTYPE GDT ON GD.GOODSTYPEID = GDT.GOODSTYPEID 
-										WHERE
-											TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
-											--TMDP.CREATETIME >= DATE'2022-08-12'
-											--AND TMDP.CREATETIME < DATE'2022-08-13'
-											AND TMDP.DEFECTCODE IN ( '147' )
-											AND PD.ISREFIRE = 0 --非重烧
-											AND PD.VALUEFLAG = '1' --有效
-											AND TMDP.VALUEFLAG = '1' --有效
-											AND SUBSTR( GDT.GOODSTYPECODE, 0, 6 ) = '001001' --大件
-											AND GDT.ISLEAFNODE = 1 --大件
-											AND PD.KILNID = 3 --TK1
-											AND GDT.GOODSTYPEID IN (4,6) --普通连体 智能连体
-										GROUP BY 
-											TMDPI.DEFECTPOSITIONID,
-											TMDPI.DEFECTPOSITIONNAME 
-										ORDER BY
-											COUNT( * ) DESC 
-									) T 
-									WHERE
-									ROWNUM <= 3 
-								) T12 
-							) TT12 ON 1 = 1
+							
 							LEFT JOIN 
 							--其它干补
 							(
@@ -809,7 +753,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 											TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
 											--TMDP.CREATETIME >= DATE'2022-08-12'
 											--AND TMDP.CREATETIME < DATE'2022-08-13'
-											AND TMDP.DEFECTCODE IN ( '145' )
+											AND TMDP.DEFECTCODE IN ( '145','147' )
 											AND PD.ISREFIRE = 0 --非重烧
 											AND PD.VALUEFLAG = '1' --有效
 											AND TMDP.VALUEFLAG = '1' --有效
@@ -927,12 +871,9 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							TO_CHAR( 数量.施釉其它 ) 施釉其它,
 							TO_CHAR( 数量.上水 ) 上水,
 							TO_CHAR( 数量.吹风 ) 吹风,
-							
 							TO_CHAR( 数量.修坯 ) 修坯,
 							TO_CHAR( 数量.一检撞伤 ) 一检撞伤,
 							TO_CHAR( 数量.锈点 ) 锈点,
-							
-							TO_CHAR( 数量.干补其他 ) 干补其他,
 							TO_CHAR( 数量.干补 ) 干补
 						FROM
 							数量 
@@ -978,8 +919,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							
 							DECODE( NVL( 数量.锈点, 0 ), 0, '0%', TO_CHAR( ( NVL( 数量.锈点, 0 ) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.0' ) || '%' ) ,
 							
-							DECODE( NVL( 数量.干补其他, 0 ), 0, '0%', TO_CHAR( ( NVL( 数量.干补其他, 0 ) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.0' ) || '%' ) ,
-							
 							DECODE( NVL( 数量.干补, 0 ), 0, '0%', TO_CHAR( ( NVL( 数量.干补, 0 ) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.0' ) || '%' )
 						FROM
 							数量
@@ -1001,7 +940,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							NVL(前三部位.修坯,'-'),
 							NVL(前三部位.一检撞伤,'-'),
 							NVL(前三部位.锈点,'-'),
-							NVL(前三部位.干补其他,'-'),
 							NVL(前三部位.干补,'-')
 						FROM
 							前三部位
@@ -1027,9 +965,6 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							'',
 							--DECODE(检验数.成检交接数量, 0, '0%', TO_CHAR( ROUND( (数量.锈点 + 数量.干补其他) / 检验数.成检交接数量, 4 ) * 100.00, 'FM900.09' ) || '%') ,
 							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' ) || '%' ) ,
-							--'0%',
-							--DECODE(检验数.成检交接数量, 0, '0%', TO_CHAR( ROUND( (数量.干补 +数量.其它) / 检验数.成检交接数量, 4 ) * 100.00, 'FM900.09' ) || '%') ,
 							DECODE( NVL( 工序缺陷数量.其它数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 工序缺陷数量.其它数量, 0 ) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) 
 									
 						
@@ -1059,10 +994,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							'',
 							--DECODE(检验数.成检交接数量, 0, '0%', TO_CHAR( ROUND( (数量.锈点 + 数量.干补其他) / 检验数.成检交接数量, 4 ) * 100.00, 'FM900.09' ) || '%') ,
 							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' ) || '%' ),
 						
-							--'0%',
-							--DECODE(检验数.成检交接数量, 0, '0%', TO_CHAR( ROUND( (数量.干补 +数量.其它) / 检验数.成检交接数量, 4 ) * 100.00, 'FM900.09' ) || '%') ,
 							DECODE( NVL( 工序废品数.其它数量, 0 ), 0, '0%', TO_CHAR( ( NVL( 工序废品数.其它数量, 0 ) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' )
 			
 						FROM