浏览代码

高压成型车间看板

ztl 2 年之前
父节点
当前提交
f3509e83c2
共有 2 个文件被更改,包括 484 次插入389 次删除
  1. 409 0
      wwwroot/main/Procedure/test6/demo.ashx
  2. 75 389
      wwwroot/main/Procedure/test6/demo.html

+ 409 - 0
wwwroot/main/Procedure/test6/demo.ashx

@@ -0,0 +1,409 @@
+<%@ WebHandler Language="C#" Class="demo" %>
+
+using Curtain.DataAccess;
+using DK.XuWei.WebMes;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Web;
+using System.Web.SessionState;
+
+public class demo : IHttpHandler {
+    
+    public void ProcessRequest (HttpContext context) {
+        context.Response.ContentType = "text/plain";
+        context.Response.ContentType = "text/plain";
+        using (IDataAccess conn = DataAccess.Create())
+        {
+                if (context.Request["m"].ToString() == "defect")
+            {
+                string sqlStr = @"SELECT T.DEFECTNAME,T.数量 FROM(									
+                                                SELECT
+	                                                TPD.DEFECTNAME,
+	                                                count(*) AS 数量
+                                                FROM
+	                                                TP_PM_DEFECT TPD
+	                                                LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID 
+                                                WHERE
+	                                                TPD.CREATETIME >= TRUNC( SYSDATE ) 
+	                                                AND TMD.DEFECTTYPEID IN ( 8, 15, 16 ) 
+                                                GROUP BY
+	                                                TPD.DEFECTNAME
+                                                ORDER BY count(*) DESC )T
+                                                WHERE ROWNUM < 4";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+
+                if (context.Request["m"].ToString() == "MonthTable")
+            {
+                string sqlStr = @"				SELECT 
+                                                B.GROUTINGLINENAME AS 成型线,
+                                                B.USERCODE AS 工号,
+                                                B.GOODSCODE AS 产品,
+                                                A.高压注浆数量 AS 日注浆数,
+                                                A.成型数 AS 日成型数,
+                                                A.注成率 AS 日注成率,
+                                                A.半检数量 AS 日半检数,
+                                                A.半检合格数量 AS 日半检合格数,
+                                                A.半检合格率 AS 日半检合格率,
+                                                A.成检数量 AS 日成检数,
+                                                A.成检合格数 AS 日成检合格数,
+                                                A.成检合格率 AS 日成检合格率,
+                                                B.高压注浆数量 AS 月注浆数,
+                                                B.成型数 AS 月成型数,
+                                                B.注成率 AS 月注成率,
+                                                B.半检数量 AS 月半检数,
+                                                B.半检合格数量 AS 月半检合格数,
+                                                B.半检合格率 AS 月半检合格率,
+                                                B.成检数量 AS 月成检数,
+                                                B.成检合格数 AS 月成检合格数,
+                                                B.成检合格率 AS 月成检合格率
+                                                FROM(
+                                                SELECT
+	                                                T.GROUTINGLINENAME,
+	                                                T.USERCODE,
+	                                                T.GOODSCODE,
+	                                                T.高压注浆数量,
+	                                                T.成型数,
+	                                                CASE WHEN T.成型数 > 0 THEN
+		                                                TO_CHAR(T.成型数/T.高压注浆数量* 100,'9,990.00') || '%'
+	                                                ELSE
+		                                                0 || '%' END AS 注成率,
+	                                                T.半检数量,
+	                                                T.半检合格数量,
+                                                --  	CASE WHEN T.半检合格数量=0 AND T.半检数量>0 THEN '0%' 
+                                                --  		   WHEN T.半检合格数量>0 AND T.半检数量=0 THEN '100%' 
+                                                --  	ELSE
+                                                --  		TO_CHAR(T.半检合格数量/T.半检数量* 100,'9,990.00') || '%' END AS 半检合格率,
+
+			                                                CASE WHEN T.半检合格数量=0 AND T.半检数量>0 THEN '0%' 
+					                                                 WHEN T.半检合格数量>0 AND T.半检数量=0 THEN '100%' 
+					                                                 WHEN T.半检合格数量>0 AND T.半检数量>0 THEN  
+				                                                 TO_CHAR(T.半检合格数量/T.半检数量* 100,'9,990.00') || '%' 
+				                                                 ELSE '0%'  END AS 半检合格率,
+                                                --   	CASE WHEN T.半检合格数量 > 0 THEN
+                                                --   		TO_CHAR(T.半检合格数量/T.半检数量* 100,'9,990.00') || '%'
+                                                --   	ELSE
+                                                --   		0 || '%' END AS 半检合格率,
+                                                  --T.半检合格数量/T.半检数量,
+	                                                T.成检数量,
+	                                                T.成检合格数,
+	                                                CASE WHEN T.成检合格数=0 AND T.成检数量>0 THEN '0%' 
+					                                                 WHEN T.成检合格数>0 AND T.成检数量=0 THEN '100%' 
+					                                                 WHEN T.成检合格数>0 AND T.成检数量>0 THEN  
+				                                                 TO_CHAR(T.成检合格数/T.成检数量* 100,'9,990.00') || '%' 
+				                                                 ELSE '0%'  END AS 成检合格率
+	                                                --T.成检合格数/T.成检数量
+                                                FROM
+	                                                (
+                                                SELECT 
+                                                 TPGL.GROUTINGLINENAME,
+                                                 TMU.USERCODE,
+                                                 TMG.GOODSCODE, 
+                                                 SUM(CASE WHEN SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A' and TPPD.CREATETIME >= TRUNC( SYSDATE ) THEN 1 ELSE 0 END  ) 高压注浆数量,
+                                                 SUM(CASE WHEN SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A' and TPPD.CREATETIME >= TRUNC( SYSDATE ) AND TPPD.SCRAPFLAG = '0' THEN 1 ELSE 0 END) 成型数,
+                                                 --TO_CHAR((SUM(CASE WHEN TPPD.GROUTINGFLAG = '1' AND TPPD.SCRAPFLAG = '0' and TPPD.CREATETIME >= TRUNC( SYSDATE ) THEN 1 ELSE 0 END) / SUM(CASE WHEN TPGL.HIGHPRESSUREFLAG=1 and TPPD.CREATETIME >= TRUNC( SYSDATE )  THEN 1 ELSE 0 END  )) * 100,'9,990.00') || '%' 注成率,
+                                                 CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END AS 半检数量,
+                                                 CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END AS 半检不合格数量,
+                                                 CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END - CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END AS 半检合格数量,
+                                                 --CASE WHEN (CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END) > 0 THEN TO_CHAR((NVL(CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END, 0) / CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END) * 100,'9,990.00') || '%' ELSE '0%' END 半检合格率,
+                                                 CASE WHEN CJ.CJNUM IS NULL THEN 0 ELSE CJ.CJNUM END AS 成检数量,
+                                                 CASE WHEN CJBHG.CJBHGNUM IS NULL THEN 0 ELSE CJBHG.CJBHGNUM END AS 成检不合格数量,
+                                                 CASE WHEN CJ.CJNUM IS NULL THEN 0 ELSE CJ.CJNUM END - CASE WHEN CJBHG.CJBHGNUM IS NULL THEN 0 ELSE CJBHG.CJBHGNUM END AS 成检合格数
+                                                FROM
+                                                 --TP_PM_PRODUCTIONDATA TPP
+                                                 --INNER JOIN 
+                                                 TP_PM_GROUTINGDAILYDETAIL TPPD
+                                                 --TPPD ON TPP.BARCODE = TPPD.BARCODE 
+                                                 LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = TPPD.GROUTINGLINEID
+                                                 LEFT JOIN TP_MST_USER TMU ON TPPD.USERID = TMU.USERID
+                                                 LEFT JOIN TP_MST_GOODS TMG ON TPPD.GOODSID = TMG.GOODSID
+                                                 LEFT JOIN (
+                                                 --半检数量
+                                                  SELECT DISTINCT
+                                                    COUNT( TPS.BARCODE ) BJJPNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(TPS.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_SEMICHECK TPS
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                     TPGL.HIGHPRESSUREFLAG = 1
+	                                                  AND PGD.TESTFLAG = 0
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND TPS.CREATETIME >= TRUNC( SYSDATE) 
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(TPS.CREATETIME, 'yyyymm') 
+                                                  ) BJJP ON BJJP.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and BJJP.USERCODE = TPPD.USERCODE and  BJJP.GOODSCODE =TMG.Goodscode
+                                                 LEFT JOIN (
+                                                 --半检不合格
+                                                  SELECT DISTINCT
+                                                    COUNT( TPS.BARCODE ) BJNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(TPS.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_SEMICHECK TPS
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+				                                                TPS.GOODSLEVELID IN (13,14)
+		                                                AND PGD.TESTFLAG = 0
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND TPS.CREATETIME >= TRUNC( SYSDATE) 
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(TPS.CREATETIME, 'yyyymm') 
+                                                  ) BJ ON BJ.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and BJ.USERCODE = TPPD.USERCODE and  bj.GOODSCODE =TMG.Goodscode
+	                                                LEFT JOIN (
+	                                                --成检数量
+                                                  SELECT DISTINCT
+                                                    COUNT( PD.BARCODE ) CJNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(PD.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_PRODUCTIONDATA PD
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = PD.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                    PD.PROCEDUREID IN (104) 
+		                                                AND PGD.TESTFLAG = 0
+		                                                AND PD.VALUEFLAG = 1
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND PD.CREATETIME >= TRUNC( SYSDATE ) 
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(PD.CREATETIME, 'yyyymm') 
+                                                  ) CJ ON CJ.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and CJ.USERCODE = TPPD.USERCODE and  CJ.GOODSCODE =TMG.Goodscode
+		                                                LEFT JOIN (
+		                                                --成检不合格
+                                                  SELECT DISTINCT
+                                                    COUNT( PD.BARCODE ) CJBHGNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(PD.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_PRODUCTIONDATA PD
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = PD.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                    pd.valueflag = '1' 
+		                                                AND PGD.TESTFLAG = 0
+		                                                and pd.modeltype IN (-1, -4, -5)  
+		                                                and pd.CHECKBATCHNO = 1 
+		                                                AND pd.GOODSLEVELID IN (6,7)
+		                                                and  length(pd.kilncarbatchno) > 0
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND PD.CREATETIME >= TRUNC( SYSDATE ) 
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(PD.CREATETIME, 'yyyymm') 
+                                                  ) CJBHG ON CJBHG.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and CJBHG.USERCODE = TPPD.USERCODE and  CJBHG.GOODSCODE =TMG.Goodscode
+                                                WHERE TPPD.VALUEFLAG = 1 
+                                                      AND TPGL.HIGHPRESSUREFLAG = 1
+			                                                AND TPPD.TESTFLAG = 0
+			                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                      AND (TPPD.CREATETIME >= TRUNC( SYSDATE )  or bj.CREATETIME = to_char(sysdate, 'yyyymmdd') OR cj.CREATETIME = to_char(sysdate, 'yyyymmdd'))  
+                                                GROUP BY 
+                                                 TPGL.GROUTINGLINENAME,
+                                                 TMU.USERCODE,
+                                                 TMG.GOODSCODE,
+                                                 BJ.BJNUM,
+                                                 CJ.CJNUM,
+                                                 BJJP.BJJPNUM,
+                                                 CJBHG.CJBHGNUM
+                                                 ) T ) A
+                                                 FULL JOIN
+                                                 (
+                                                 SELECT
+	                                                --DISTINCT
+	                                                T2.GROUTINGLINENAME,
+	                                                T2.USERCODE,
+	                                                T2.GOODSCODE,
+	                                                T2.高压注浆数量,
+	                                                T2.成型数,
+	                                                CASE WHEN T2.成型数 > 0 THEN
+		                                                TO_CHAR(T2.成型数/T2.高压注浆数量* 100,'9,990.00') || '%'
+	                                                ELSE
+		                                                0 || '%' END AS 注成率,
+	                                                T2.半检数量,
+	                                                T2.半检合格数量,
+                                                --  	CASE WHEN T.半检合格数量=0 AND T.半检数量>0 THEN '0%' 
+                                                --  		   WHEN T.半检合格数量>0 AND T.半检数量=0 THEN '100%' 
+                                                --  	ELSE
+                                                --  		TO_CHAR(T.半检合格数量/T.半检数量* 100,'9,990.00') || '%' END AS 半检合格率,
+
+			                                                CASE WHEN T2.半检合格数量=0 AND T2.半检数量>0 THEN '0%' 
+					                                                 WHEN T2.半检合格数量>0 AND T2.半检数量=0 THEN '100%' 
+					                                                 WHEN T2.半检合格数量>0 AND T2.半检数量>0 THEN  
+				                                                 TO_CHAR(T2.半检合格数量/T2.半检数量* 100,'9,990.00') || '%' 
+				                                                 ELSE '0%'  END AS 半检合格率,
+                                                --   	CASE WHEN T.半检合格数量 > 0 THEN
+                                                --   		TO_CHAR(T.半检合格数量/T.半检数量* 100,'9,990.00') || '%'
+                                                --   	ELSE
+                                                --   		0 || '%' END AS 半检合格率,
+                                                  --T.半检合格数量/T.半检数量,
+	                                                T2.成检数量,
+	                                                T2.成检合格数,
+	                                                CASE WHEN T2.成检合格数=0 AND T2.成检数量>0 THEN '0%' 
+					                                                 WHEN T2.成检合格数>0 AND T2.成检数量=0 THEN '100%' 
+					                                                 WHEN T2.成检合格数>0 AND T2.成检数量>0 THEN  
+				                                                 TO_CHAR(T2.成检合格数/T2.成检数量* 100,'9,990.00') || '%' 
+				                                                 ELSE '0%'  END AS 成检合格率
+	                                                --T.成检合格数/T.成检数量
+                                                FROM
+	                                                (
+                                                SELECT 
+                                                DISTINCT
+                                                 TPGL.GROUTINGLINENAME,
+                                                 TMU.USERCODE,
+                                                 TMG.GOODSCODE, 
+                                                 SUM(CASE WHEN SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A' and TPPD.CREATETIME >= trunc(sysdate, 'mm') THEN 1 ELSE 0 END  ) 高压注浆数量,
+                                                 SUM(CASE WHEN SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A' and TPPD.CREATETIME >= trunc(sysdate, 'mm') AND TPPD.SCRAPFLAG = '0' THEN 1 ELSE 0 END) 成型数,
+                                                 --TO_CHAR((SUM(CASE WHEN TPPD.GROUTINGFLAG = '1' AND TPPD.SCRAPFLAG = '0' and TPPD.CREATETIME >= TRUNC( SYSDATE ) THEN 1 ELSE 0 END) / SUM(CASE WHEN TPGL.HIGHPRESSUREFLAG=1 and TPPD.CREATETIME >= TRUNC( SYSDATE )  THEN 1 ELSE 0 END  )) * 100,'9,990.00') || '%' 注成率,
+                                                 CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END AS 半检数量,
+                                                 CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END AS 半检不合格数量,
+                                                 CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END - CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END AS 半检合格数量,
+                                                 --CASE WHEN (CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END) > 0 THEN TO_CHAR((NVL(CASE WHEN BJ.BJNUM IS NULL THEN 0 ELSE BJ.BJNUM END, 0) / CASE WHEN BJJP.BJJPNUM IS NULL THEN 0 ELSE BJJP.BJJPNUM END) * 100,'9,990.00') || '%' ELSE '0%' END 半检合格率,
+                                                 CASE WHEN CJ.CJNUM IS NULL THEN 0 ELSE CJ.CJNUM END AS 成检数量,
+                                                 CASE WHEN CJBHG.CJBHGNUM IS NULL THEN 0 ELSE CJBHG.CJBHGNUM END AS 成检不合格数量,
+                                                 CASE WHEN CJ.CJNUM IS NULL THEN 0 ELSE CJ.CJNUM END - CASE WHEN CJBHG.CJBHGNUM IS NULL THEN 0 ELSE CJBHG.CJBHGNUM END AS 成检合格数
+                                                FROM
+                                                 --TP_PM_PRODUCTIONDATA TPP
+                                                 --INNER JOIN 
+                                                 TP_PM_GROUTINGDAILYDETAIL TPPD
+                                                 --TPPD ON TPP.BARCODE = TPPD.BARCODE 
+                                                 LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = TPPD.GROUTINGLINEID
+                                                 LEFT JOIN TP_MST_USER TMU ON TPPD.USERID = TMU.USERID
+                                                 LEFT JOIN TP_MST_GOODS TMG ON TPPD.GOODSID = TMG.GOODSID
+                                                 LEFT JOIN (
+                                                 --半检数量
+                                                  SELECT DISTINCT
+                                                    COUNT( TPS.BARCODE ) BJJPNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(TPS.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_SEMICHECK TPS
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                     TPGL.HIGHPRESSUREFLAG = 1
+	                                                  AND PGD.TESTFLAG = 0
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND TPS.CREATETIME >= trunc(sysdate, 'mm')
+		                                                --DATE'2023-6-1'
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(TPS.CREATETIME, 'yyyymm') 
+                                                  ) BJJP ON BJJP.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and BJJP.USERCODE = TPPD.USERCODE and  BJJP.GOODSCODE =TMG.Goodscode
+                                                 LEFT JOIN (
+                                                 --半检不合格
+                                                  SELECT DISTINCT
+                                                    COUNT( TPS.BARCODE ) BJNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(TPS.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_SEMICHECK TPS
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+				                                                TPS.GOODSLEVELID IN (13,14)
+		                                                AND PGD.TESTFLAG = 0
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND TPS.CREATETIME >= trunc(sysdate, 'mm')
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(TPS.CREATETIME, 'yyyymm') 
+                                                  ) BJ ON BJ.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and BJ.USERCODE = TPPD.USERCODE and  bj.GOODSCODE =TMG.Goodscode
+	                                                LEFT JOIN (
+	                                                --成检数量
+                                                  SELECT DISTINCT
+                                                    COUNT( PD.BARCODE ) CJNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(PD.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_PRODUCTIONDATA PD
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = PD.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                    PD.PROCEDUREID IN (104) 
+		                                                AND PD.VALUEFLAG = 1
+		                                                AND PGD.TESTFLAG = 0
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND PD.CREATETIME >= trunc(sysdate, 'mm')
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(PD.CREATETIME, 'yyyymm') 
+                                                  ) CJ ON CJ.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and CJ.USERCODE = TPPD.USERCODE and  CJ.GOODSCODE =TMG.Goodscode
+		                                                LEFT JOIN (
+		                                                --成检不合格
+                                                  SELECT DISTINCT
+                                                    COUNT( PD.BARCODE ) CJBHGNUM,
+                                                    PGD.GROUTINGLINECODE,
+                                                    PGD.USERCODE,
+                                                    PGD.GOODSCODE ,
+                                                    to_char(PD.CREATETIME, 'yyyymm')   as CREATETIME
+                                                  FROM
+                                                    TP_PM_PRODUCTIONDATA PD
+                                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = PD.BARCODE
+                                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
+                                                  WHERE
+                                                    pd.valueflag = '1' 
+		                                                AND PGD.TESTFLAG = 0
+		                                                and pd.modeltype IN (-1, -4, -5)  
+		                                                and pd.CHECKBATCHNO = 1 
+		                                                AND pd.GOODSLEVELID IN (6,7)
+		                                                and  length(pd.kilncarbatchno) > 0
+                                                    AND TPGL.HIGHPRESSUREFLAG = 1
+		                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                    AND PD.CREATETIME >= trunc(sysdate, 'mm')
+                                                  GROUP BY
+                                                    PGD.GROUTINGLINECODE,PGD.USERCODE,PGD.GOODSCODE,to_char(PD.CREATETIME, 'yyyymm') 
+                                                  ) CJBHG ON CJBHG.GROUTINGLINECODE = TPPD.GROUTINGLINECODE and CJBHG.USERCODE = TPPD.USERCODE and  CJBHG.GOODSCODE =TMG.Goodscode
+                                                WHERE TPPD.VALUEFLAG = 1 
+                                                      AND TPGL.HIGHPRESSUREFLAG = 1
+			                                                AND TPPD.TESTFLAG = 0
+			                                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
+                                                      AND (TPPD.CREATETIME >= trunc(sysdate, 'mm')  or bj.CREATETIME = to_char(sysdate, 'yyyymmdd') OR cj.CREATETIME = to_char(sysdate, 'yyyymmdd'))  
+                                                GROUP BY 
+                                                 TPGL.GROUTINGLINENAME,
+                                                 TMU.USERCODE,
+                                                 TMG.GOODSCODE,
+                                                 BJ.BJNUM,
+                                                 CJ.CJNUM,
+                                                 BJJP.BJJPNUM,
+                                                 CJBHG.CJBHGNUM
+                                                 ) T2 ) B ON A.GROUTINGLINENAME = B.GROUTINGLINENAME AND A.USERCODE = B.USERCODE AND A.GOODSCODE = B.GOODSCODE
+											 ";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                   int a = 1;
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+        }
+    }
+ 
+    public bool IsReusable {
+        get {
+            return false;
+        }
+    }
+
+}

+ 75 - 389
wwwroot/main/Procedure/test6/demo.html

@@ -37,7 +37,7 @@
                         </tr>
                         <tr class="tr_title_warning">
                             <td style="width:7%;">成型线</td>
-                            <td style="width:4.5%;">班组</td>
+                            <td style="width:4.5%;">工号</td>
                             <td style="width:7.5%;">产品</td>
                             <td style="width:4.5%;">注浆数</td>
                             <td style="width:4.5%;">成型数</td>
@@ -59,377 +59,34 @@
                             <td style="width:4.5%;">合格率</td>
                         </tr>
                     </table>
-                    <div style="display:flex; height:545px;overflow:hidden;">
-                        <table id="mainTable" cellspacing="0" cellpadding="0" border="0" style="width:100%;">
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; width: 7%;">C03A01</td>
-                                <td style="font-size: 18px; width: 4.5%;">甲班</td>
-                                <td style="font-size: 18px; width: 7.5%;">H0966-W</td>
-                                <td style="font-size: 18px; width: 4.5%;">1314</td>
-                                <td style="font-size: 18px; width: 4.5%;">1169</td>
-                                <td style="font-size: 18px; width: 4.5%;">919</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1314</td>
-                                <td style="font-size: 18px; width: 4.5%;">1169</td>
-                                <td style="font-size: 18px; width: 4.5%;">919</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A02</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A03</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A04</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A05</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A06</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; width: 7%;">C03A07</td>
-                                <td style="font-size: 18px; width: 4.5%;">甲班</td>
-                                <td style="font-size: 18px; width: 7.5%;">H0966-W</td>
-                                <td style="font-size: 18px; width: 4.5%;">1314</td>
-                                <td style="font-size: 18px; width: 4.5%;">1169</td>
-                                <td style="font-size: 18px; width: 4.5%;">919</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1314</td>
-                                <td style="font-size: 18px; width: 4.5%;">1169</td>
-                                <td style="font-size: 18px; width: 4.5%;">919</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1160</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                                <td style="font-size: 18px; width: 4.5%;">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A08</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A09</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A10</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A11</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A12</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A13</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A14</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_light_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A15</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                            </tr>
-                            <tr class="tr_bg_dark_warning" style="height:30px;">
-                                <td style="font-size: 18px; ">C03A16</td>
-                                <td style="font-size: 18px; ">甲班</td>
-                                <td style="font-size: 18px; ">H0966-W</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1314</td>
-                                <td style="font-size: 18px; ">1169</td>
-                                <td style="font-size: 18px; ">919</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1160</td>
-                                <td style="font-size: 18px; ">1045</td>
-                                <td style="font-size: 18px; ">1045</td>
+                    <div style=" height:580px;overflow:hidden;">
+                        <table id="dayTable_template" style="display:none;">
+                            <tr class="tr_title_warning">
+                                <td style="width:7%;">{成型线}</td>
+                                <td style="width:4.5%;">{工号}</td>
+                                <td style="width:7.5%;font-size:18px;">{产品}</td>
+                                <td style="width:4.5%;">{日注浆数}</td>
+                                <td style="width:4.5%;">{日成型数}</td>
+                                <td style="width:4.5%;">{日注成率}</td>
+                                <td style="width:4.5%;">{日半检数}</td>
+                                <td style="width:4.5%;">{日半检合格数}</td>
+                                <td style="width:4.5%;">{日半检合格率}</td>
+                                <td style="width:4.5%;">{日成检数}</td>
+                                <td style="width:4.5%;">{日成检合格数}</td>
+                                <td style="width:4.5%;">{日成检合格率}</td>
+                                <td style="width:4.5%;">{月注浆数}</td>
+                                <td style="width:4.5%;">{月成型数}</td>
+                                <td style="width:4.5%;">{月注成率}</td>
+                                <td style="width:4.5%;">{月半检数}</td>
+                                <td style="width:4.5%;">{月半检合格数}</td>
+                                <td style="width:4.5%;">{月半检合格率}</td>
+                                <td style="width:4.5%;">{月成检数}</td>
+                                <td style="width:4.5%;">{月成检合格数}</td>
+                                <td style="width:4.5%;">{月成检合格率}</td>
                             </tr>
                         </table>
+                        <table id="dayTable" style="width: 100%; ">
+                        </table>
                     </div>
                 </div>
             </div>
@@ -466,24 +123,40 @@
                 clearInterval(mainInterval);
                 console.log("Interval Stop!");
             }
-            //$.get("rpt.ashx?m=table1", function (data) {
-            //    var json = JSON.parse(data);
-            //    if (json["success"] == true) {
-            //        $("#qq").html("");
-            //        for (var i = 0; i < json["rows"].length; i++) {
-            //            var temp = $("#qq_template").html();
-            //            temp = temp.replace("<tbody>", "").replace("</tbody>", "");
-            //            temp = temp.replace("{q1}", json["rows"][i]["GOODSCODE"]);
-            //            temp = temp.replace("{q2}", json["rows"][i]["NUM1"]);
-            //            temp = temp.replace("{q3}", json["rows"][i]["NUM2"]);
-            //            temp = temp.replace("{q4}", json["rows"][i]["REACH"]);
-            //            $("#qq").append(temp);
-            //        }
-            //        mainRowCount = json["rows"].length;
-            //        mainInterval = setInterval(qqScroll, 1500);
-            //        console.log("Interval Start!");
-            //    }
-            //});
+            $.get("demo.ashx?m=MonthTable", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    $("#dayTable").html("");
+                    for (var i = 0; i < json["rows"].length; i++) {
+                        var temp = $("#dayTable_template").html();
+                        temp = temp.replace("<tbody>", "").replace("</tbody>", "");
+                        temp = temp.replace('{成型线}', json["rows"][i]['成型线']);
+                        temp = temp.replace('{工号}', json["rows"][i]['工号']);
+                        temp = temp.replace('{产品}', json["rows"][i]['产品']);
+                        temp = temp.replace('{日注浆数}', json["rows"][i]['日注浆数']);
+                        temp = temp.replace('{日成型数}', json["rows"][i]['日成型数']);
+                        temp = temp.replace('{日注成率}', json["rows"][i]['日注成率']);
+                        temp = temp.replace('{日半检数}', json["rows"][i]['日半检数']);
+                        temp = temp.replace('{日半检合格数}', json["rows"][i]['日半检合格数']);
+                        temp = temp.replace('{日半检合格率}', json["rows"][i]['日半检合格率']);
+                        temp = temp.replace('{日成检数}', json["rows"][i]['日成检数']);
+                        temp = temp.replace('{日成检合格数}', json["rows"][i]['日成检合格数']);
+                        temp = temp.replace('{日成检合格率}', json["rows"][i]['日成检合格率']);
+                        temp = temp.replace('{月注浆数}', json["rows"][i]['月注浆数']);
+                        temp = temp.replace('{月成型数}', json["rows"][i]['月成型数']);
+                        temp = temp.replace('{月注成率}', json["rows"][i]['月注成率']);
+                        temp = temp.replace('{月半检数}', json["rows"][i]['月半检数']);
+                        temp = temp.replace('{月半检合格数}', json["rows"][i]['月半检合格数']);
+                        temp = temp.replace('{月半检合格率}', json["rows"][i]['月半检合格率']);
+                        temp = temp.replace('{月成检数}', json["rows"][i]['月成检数']);
+                        temp = temp.replace('{月成检合格数}', json["rows"][i]['月成检合格数']);
+                        temp = temp.replace('{月成检合格率}', json["rows"][i]['月成检合格率']);
+                        $("#dayTable").append(temp);
+                    }
+                    dayTableRowCount = json["rows"].length;
+                    dayInterval = setInterval(dayTableScroll, 3000);
+                }
+            });
             mainRowCount = 16;
             mainInterval = setInterval(mainScroll, 3000);
         }
@@ -501,10 +174,23 @@
         $(document).ready(function () {
             initData();
             doGetData = setInterval(function () { timeUpdate(); }, 5000);
-
             loadMainTable();
+            DdfectData();
         });
 
+        function DdfectData() {
+            $.get("demo.ashx?m=defect", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var A = parseFloat(json["rows"][0]["数量"]);
+                    var B = parseFloat(json["rows"][1]["数量"]);
+                    var C = parseFloat(json["rows"][2]["数量"]);
+                    window.DefectA.data.datasets[0].data = [A, B, C];
+                    window.DefectA.update();
+                }
+            });
+        }
+
         function timeUpdate() {
             loadData();