成检试水三检看板完成

wwwroot/main/Procedure/test8/demo.ashx

@@ -189,17 +189,7 @@ public class demo : IHttpHandler {
 													B.次品数量 AS 次品数量,
 													B.重烧数量 AS 重烧数量,
 													B.冷补数量 AS 冷补数量,
-												CASE
-														WHEN B.正品数量 = 0 
-														AND B.检验数量 > 0 THEN
-															'0%'
-															WHEN B.正品数量 > 0
-															AND B.检验数量 = 0 THEN
-																'100%'
-																WHEN B.正品数量 > 0
-																AND B.检验数量 > 0 THEN
-																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' ELSE '0%' 
-																	END AS 合格率,
+																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 合格率,
 																TO_CHAR( ( B.次品数量 / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 次品报废率
 															FROM
 																(
@@ -520,18 +510,8 @@ public class demo : IHttpHandler {
 													B.次品数量 AS 次品数量,
 													B.重烧数量 AS 重烧数量,
 													B.冷补数量 AS 冷补数量,
-												CASE
-														WHEN B.正品数量 = 0 
-														AND B.检验数量 > 0 THEN
-															'0%' 
-															WHEN B.正品数量 > 0 
-															AND B.检验数量 = 0 THEN
-																'100%' 
-																WHEN B.正品数量 > 0 
-																AND B.检验数量 > 0 THEN
-																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' ELSE '0%' 
-																	END AS 合格率,
-																TO_CHAR( ( B.次品数量 / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 次品报废率
+													TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 合格率,
+													TO_CHAR( ( B.次品数量 / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 次品报废率
 															FROM
 																(
 																	SELECT--decode( H.gid, 7, '总计', 3, '合计【' || H.产品型号 || '】', 0, H.产品型号, '--' ) 产品型号,

wwwroot/main/Procedure/test8/demo.html

@@ -70,16 +70,16 @@
                             <td colspan="10" style="color: white;">修复产品外观检验统计</td>
                         </tr>
                         <tr class="tr_title_warning"style="height: 50px;">
-                            <td style="width: 6.4%; font-size: 10px; padding: 0px 0px 0px 0px;">产品型号</td>
+                            <td style="width: 6.3%; font-size: 10px; padding: 0px 0px 0px 0px;">产品型号</td>
                             <td style="width: 5.1%; font-size: 10px; padding: 0px 0px 0px 0px;">成型产线</td>
                             <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">检验数量</td>
-                            <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">正品数量</td>
+                            <td style="width: 4.9%; font-size: 10px; padding: 0px 0px 0px 0px;">正品数量</td>
                             <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">副品数量</td>
                             <td style="width: 5%; font-size: 10px; padding: 0px 0px 0px 0px; ">次品数量</td>
                             <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">重烧数量</td>
                             <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">冷补数量</td>
-                            <td style="width: 5.5%; font-size: 10px; padding: 0px 0px 0px 0px;">合格率</td>
-                            <td style="width: 5.5%; font-size: 10px; padding: 0px 0px 0px 0px;">次品报废率</td>
+                            <td style="width: 5.4%; font-size: 10px; padding: 0px 0px 0px 0px;">合格率</td>
+                            <td style="width: 4.9%; font-size: 10px; padding: 0px 0px 0px 0px;">次品报废率</td>
                         </tr>
                     </table>
                     <div style=" height: 522px; overflow: hidden; width: 100%;">

wwwroot/main/Procedure/test9/demo.ashx

@@ -30,6 +30,7 @@ public class demo : IHttpHandler {
 									WHERE
 										TPD.CREATETIME >= TRUNC( SYSDATE ) 
 										AND TPD.VALUEFLAG = 1 
+										AND TPD.PROCEDUREID IN (125)
 									GROUP BY
 										TMDP.S_NAME
 									ORDER BY
@@ -53,7 +54,7 @@ public class demo : IHttpHandler {
 												WHERE
 													TPD.CHECKTIME >= TRUNC( SYSDATE ) 
 													AND TPD.VALUEFLAG = 1 
-													AND TPD.PROCEDUREID IN (125,124)
+													AND TPD.PROCEDUREID IN (125)
 												GROUP BY
 													TMD.S_name 
 												ORDER BY
@@ -113,14 +114,12 @@ public class demo : IHttpHandler {
 									to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA TPPD
-									INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-									LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
 								WHERE
-									TPPD.PROCEDUREID IN ( 104 ) 
+									TPPD.PROCEDUREID IN ( 125 ) 
 									AND TPPD.ISREFIRE = 0 
 									AND PGD.TESTFLAG = 0 
 									AND TPPD.VALUEFLAG = 1 
-									AND TPPD.checkflag = '1' 
 									AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
 								GROUP BY
 									to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
@@ -158,7 +157,7 @@ public class demo : IHttpHandler {
 										) T ON T.BARCODE = TPPD.BARCODE 
 									WHERE
 										TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
-										AND TPPD.PROCEDUREID IN ( 104 ) 
+										AND TPPD.PROCEDUREID IN ( 125 ) 
 										AND length( TPPD.kilncarbatchno ) > 0 
 										AND TPGL.TESTFLAG = 0 
 										AND TPPD.VALUEFLAG = 1 
@@ -177,7 +176,7 @@ public class demo : IHttpHandler {
                 context.Response.Write(jsonStr);
             }
 
-                //产线信息
+                //三检信息
 
                 if (context.Request["m"].ToString() == "MonthTable")
             {
@@ -190,17 +189,8 @@ public class demo : IHttpHandler {
 													B.次品数量 AS 次品数量,
 													B.重烧数量 AS 重烧数量,
 													B.冷补数量 AS 冷补数量,
-												CASE
-														WHEN B.正品数量 = 0 
-														AND B.检验数量 > 0 THEN
-															'0%' 
-															WHEN B.正品数量 > 0 
-															AND B.检验数量 = 0 THEN
-																'100%' 
-																WHEN B.正品数量 > 0 
-																AND B.检验数量 > 0 THEN
-																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' ELSE '0%' 
-																	END AS 合格率,
+																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%'
+																	 AS 合格率,
 																TO_CHAR( ( B.次品数量 / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 次品报废率
 															FROM
 																(
@@ -322,7 +312,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.GOODSLEVELID IN ( 5 ) 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -331,8 +321,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 0 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -367,7 +357,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.GOODSLEVELID IN ( 7 ) 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -376,8 +366,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 0 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -412,7 +402,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TPPD.GOODSLEVELID IN ( 6 ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -421,8 +411,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 0 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -457,7 +447,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.GOODSLEVELID IN ( 16 ) 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -466,21 +456,21 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 0 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
 															AND TPPD.ISREFIRE = 0 
-														) T 
+														) T
 													GROUP BY
 														T.GOODSCODE,
-														T.GROUTINGLINECODE 
-													) CJLB ON CJLB.GOODSCODE = TPPD.GOODSCODE 
+														T.GROUTINGLINECODE
+													) CJLB ON CJLB.GOODSCODE = TPPD.GOODSCODE
 													AND CJLB.GROUTINGLINECODE = TPGL.GROUTINGLINECODE 
 												WHERE
 													TPPD.CREATETIME >= TRUNC( SYSDATE ) 
-													AND TPPD.PROCEDUREID IN ( 104 ) 
+													AND TPPD.PROCEDUREID IN ( 125 ) 
 													AND TPGL.TESTFLAG = 0 
 													AND TPPD.VALUEFLAG = 1 
 													AND TPPD.ISREFIRE = 0 
@@ -521,17 +511,8 @@ public class demo : IHttpHandler {
 													B.次品数量 AS 次品数量,
 													B.重烧数量 AS 重烧数量,
 													B.冷补数量 AS 冷补数量,
-												CASE
-														WHEN B.正品数量 = 0 
-														AND B.检验数量 > 0 THEN
-															'0%' 
-															WHEN B.正品数量 > 0 
-															AND B.检验数量 = 0 THEN
-																'100%' 
-																WHEN B.正品数量 > 0 
-																AND B.检验数量 > 0 THEN
-																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%' ELSE '0%' 
-																	END AS 合格率,
+																	TO_CHAR( ( (B.检验数量-B.次品数量-B.重烧数量) / B.检验数量 ) * 100, '9,990.00' ) || '%'
+																	 AS 合格率,
 																TO_CHAR( ( B.次品数量 / B.检验数量 ) * 100, '9,990.00' ) || '%' AS 次品报废率
 															FROM
 																(
@@ -653,17 +634,17 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
-																AND TPPD.GOODSLEVELID IN (5)
-																AND TPPD.CHECKBATCHNO = 1
+																AND TPPD.GOODSLEVELID IN ( 5 ) 
+																AND TPPD.CHECKBATCHNO = 1 
 																AND TPGL.TESTFLAG = 0 
 																AND TPPD.VALUEFLAG = 1 
-																AND TPPD.ISREFIRE = 6
+																AND TPPD.ISREFIRE = 6 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -698,7 +679,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.GOODSLEVELID IN ( 7 ) 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -707,8 +688,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 6 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -743,7 +724,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TPPD.GOODSLEVELID IN ( 6 ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -752,8 +733,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 6 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -788,7 +769,7 @@ public class demo : IHttpHandler {
 																LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 																LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
 															WHERE
-																TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
+																TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 																AND TMD.DEFECTTYPEID <> 14 
 																AND TPPD.GOODSLEVELID IN ( 16 ) 
 																AND TPPD.CHECKBATCHNO = 1 
@@ -797,8 +778,8 @@ public class demo : IHttpHandler {
 																AND TPPD.ISREFIRE = 6 
 															) T ON T.BARCODE = TPPD.BARCODE 
 														WHERE
-															TPPD.CHECKTIME >= TRUNC( SYSDATE ) 
-															AND TPPD.PROCEDUREID IN ( 104 ) 
+															TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPPD.PROCEDUREID IN ( 125 ) 
 															AND length( TPPD.kilncarbatchno ) > 0 
 															AND TPGL.TESTFLAG = 0 
 															AND TPPD.VALUEFLAG = 1 
@@ -811,7 +792,7 @@ public class demo : IHttpHandler {
 													AND CJLB.GROUTINGLINECODE = TPGL.GROUTINGLINECODE 
 												WHERE
 													TPPD.CREATETIME >= TRUNC( SYSDATE ) 
-													AND TPPD.PROCEDUREID IN ( 104 ) 
+													AND TPPD.PROCEDUREID IN ( 125 ) 
 													AND TPGL.TESTFLAG = 0 
 													AND TPPD.VALUEFLAG = 1 
 													AND TPPD.ISREFIRE = 6 

wwwroot/main/Procedure/test9/demo.html

@@ -86,16 +86,16 @@
                         <div>
                             <table id="dayTable_templatetwo" style="display:none;">
                                 <tr class="tr_title_warning" style="height: 50px;">
-                                    <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px; ">{产品型号}</td>
+                                    <td style="width: 5.1%; font-size: 10px; padding: 0px 0px 0px 0px; ">{产品型号}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{成型产线}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{检验数量}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{正品数量}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{副品数量}</td>
-                                    <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{次品数量}</td>
+                                    <td style="width: 4.9%; font-size: 10px; padding: 0px 0px 0px 0px;">{次品数量}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{重烧数量}</td>
                                     <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{冷补数量}</td>
-                                    <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{合格率}</td>
-                                    <td style="width: 4.8%; font-size: 10px; padding: 0px 0px 0px 0px;">{次品报废率}</td>
+                                    <td style="width: 5.1%; font-size: 10px; padding: 0px 0px 0px 0px;">{合格率}</td>
+                                    <td style="width: 5%; font-size: 10px; padding: 0px 0px 0px 0px;">{次品报废率}</td>
                                 </tr>
                             </table>
                         </div>
@@ -178,7 +178,7 @@
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     $("#dayTabletwo").html("");
-                    for (var i = 0; i < json["rows"].length; i++) {
+                    for (var i = 0; i < json["rows"].length; i++){
                         var temp = $("#dayTable_templatetwo").html();
                         temp = temp.replace("<tbody>", "").replace("</tbody>", "");
                         temp = temp.replace('{产品型号}', json["rows"][i]['产品型号']);