一检看板=>交坯质量 添加工号 T56,T26

修改count的合格率算法DECODE( NVL( 工序缺陷数量.一检数量, 0 ), 0, '0%', 由0变为100%(如果错,可改回来)

wwwroot/main/Procedure/test10/Onecheck.ashx

@@ -59,7 +59,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
 								LEFT JOIN TP_MST_GOODSTYPE GDT ON GD.GOODSTYPEID = GDT.GOODSTYPEID 
 								INNER JOIN TP_PM_PRODUCTIONDATA PDA ON PDA.BARCODE=PD.BARCODE
-								AND PDA.USERCODE  IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+								AND PDA.USERCODE  IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 							WHERE
 								PD.VALUEFLAG = '1' 
 						 		AND  PD.CREATETIME >= trunc(sysdate) 
@@ -78,7 +78,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							DEFECT.CREATETIME >= trunc(sysdate) 
 							AND PD.VALUEFLAG = '1' --有效
 							AND DEFECT.VALUEFLAG = '1' --有效
-							AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+							AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 						GROUP BY
 							PD.USERCODE
 						),
@@ -142,7 +142,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								TMDPI.DEFECTPOSITIONID, TMDPI.DEFECTPOSITIONNAME 
 							ORDER BY COUNT( 1 ) DESC  ) T 	WHERE ROWNUM <= 3   )  ) 其他
 					FROM TP_MST_USER  users
-					WHERE USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+					WHERE USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 					),
 					数量 AS(
 						SELECT
@@ -155,7 +155,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								LEFT JOIN TP_PM_PRODUCTIONDATA PD ON DEFECT.BARCODE = PD.BARCODE
 							WHERE
 						 		DEFECT.CREATETIME >= trunc(sysdate) 
-								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 								AND PD.VALUEFLAG = '1' --有效
 								AND DEFECT.VALUEFLAG = '1' --有效
 							GROUP BY
@@ -170,7 +170,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							WHERE
 						 		 PD.CREATETIME >= trunc(sysdate) 
 								
-								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 								AND PD.VALUEFLAG = '1' --有效
 								AND PD.PROCEDUREID=55
 							GROUP BY
@@ -222,7 +222,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
 								LEFT JOIN TP_MST_GOODSTYPE GDT ON GD.GOODSTYPEID = GDT.GOODSTYPEID 
 								INNER JOIN TP_PM_PRODUCTIONDATA PDA ON PDA.BARCODE=PD.BARCODE
-								AND PDA.USERCODE  IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+								AND PDA.USERCODE  IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 							WHERE
 								PD.VALUEFLAG = '1' 
 						 		AND PD.CREATETIME >= trunc(sysdate) 
@@ -241,7 +241,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 							DEFECT.CREATETIME >= trunc(sysdate) 
 							AND PD.VALUEFLAG = '1' --有效
 							AND DEFECT.VALUEFLAG = '1' --有效
-							AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+							AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 						GROUP BY
 							PD.USERCODE
 						),
@@ -305,7 +305,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								TMDPI.DEFECTPOSITIONID, TMDPI.DEFECTPOSITIONNAME 
 							ORDER BY COUNT( 1 ) DESC  ) T 	WHERE ROWNUM <= 3   )  ) 其他
 					FROM TP_MST_USER  users
-					WHERE USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+					WHERE USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 					),
 					数量 AS(
 						SELECT
@@ -318,7 +318,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 								LEFT JOIN TP_PM_PRODUCTIONDATA PD ON DEFECT.BARCODE = PD.BARCODE
 							WHERE
 						 		 DEFECT.CREATETIME >= trunc(sysdate) 
-								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19')
+								AND PD.USERCODE IN ('T03','T04','T05','T06','T07','T08','T09','T12','T13','T14','T15','T16','T17','T18','T19','T25','T26')
 								AND PD.VALUEFLAG = '1' --有效
 								AND DEFECT.VALUEFLAG = '1' --有效
 							GROUP BY
@@ -335,7 +335,7 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 					NVL(前三部位.裂, '--')裂,
 					NVL(前三部位.不平,'--')不平,
 					NVL(前三部位.其他, '--')其他,
-					DECODE( NVL( 工序缺陷数量.一检数量, 0 ), 0, '0%', TO_CHAR( ( ( NVL( 检验数.成检交接数量, 1 )- NVL( 工序缺陷数量.一检数量, 0 )) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) 合格率
+					DECODE( NVL( 工序缺陷数量.一检数量, 0 ), 0, '100%', TO_CHAR( ( ( NVL( 检验数.成检交接数量, 1 )- NVL( 工序缺陷数量.一检数量, 0 )) / DECODE( NVL( 检验数.成检交接数量, 1 ), 0, 1, NVL( 检验数.成检交接数量, 1 ) ) ) * 100, 'fm99990.00' ) || '%' ) 合格率
 					FROM 前三部位 
 					LEFT JOIN 检验数 ON 检验数.USERCODE = 前三部位.USERCODE
 					LEFT JOIN 工序缺陷数量 ON 工序缺陷数量.USERCODE=前三部位.USERCODE