看板调整

wwwroot/main/Procedure/test12/demo.ashx

@@ -254,20 +254,23 @@ public class demo : IHttpHandler {
 										COUNT( * ) count
 									FROM
 										TP_PM_SEMICHECKDEFECT TPSD
-										LEFT JOIN TP_PM_SEMICHECK TPS ON TPSD.SEMICHECKID = TPS.SEMICHECKID
+										INNER JOIN TP_PM_SEMICHECK TPS ON TPSD.SEMICHECKID = TPS.SEMICHECKID
 										LEFT JOIN TP_MST_DEFECT TMD ON TPSD.DEFECTCODE = TMD.DEFECTCODE 
 										--LEFT JOIN TP_MST_DEFECT TMD ON TPSD.DEFECTID = TMD.DEFECTID
 										LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
 										LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
 									WHERE
-										TPSD.CREATETIME >= TRUNC( SYSDATE ) 
+										TPS.UPDATETIME >= TRUNC( SYSDATE) 
 										AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
-										AND TPS.PROCEDUREID IN (117,94,97,119)
+										--AND TPS.PROCEDUREID IN (83,88,92,118,93)
+										AND TPS.RESEMICHECKTYPE = 2
 									GROUP BY
-										TMD.S_name
+										TMD.S_name 
 									ORDER BY
 										COUNT( * ) DESC)T
-										WHERE ROWNUM < 4";
+										WHERE ROWNUM < 4
+										
+									";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/test14/demo.ashx

@@ -250,7 +250,7 @@ public class demo : IHttpHandler {
 											LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPP.BARCODE
 											LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
 										WHERE
-											TPP.PROCEDUREID IN ( 115 ) 
+											TPP.PROCEDUREID IN ( 98 ) 
 											AND TPP.VALUEFLAG = 1 
 											AND TPGL.TESTFLAG = 0 
 											AND TPP.CREATETIME >= trunc( SYSDATE - 7 ) 

wwwroot/main/Procedure/test14/demo.html

@@ -75,7 +75,7 @@
                     <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
                 <div style="width: 28%; height: 380px; right: 40px; margin-top: 365px; ">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">吹尘工号产量</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉七日产量</div>
                     <canvas id="canvasDayCC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
             </div>

wwwroot/main/Procedure/test6/demo.ashx

@@ -1352,6 +1352,7 @@ FROM
 																											AND TPGL.HIGHPRESSUREFLAG = 1 
 																											AND TPPD.TESTFLAG = 0 
 																											AND SUBSTR( TPGL.GROUTINGLINENAME, 1, 2 ) = 'C0' 
+																											AND SUBSTR( TMG.GOODSCODE, -2, LENGTH(TMG.GOODSCODE) ) = '-W' 
 																											AND (
 																												TPPD.CREATETIME >= trunc( SYSDATE, 'mm' ) 
 																												OR bj.CREATETIME = to_char( SYSDATE, 'yyyymmdd' ) 
@@ -1368,7 +1369,7 @@ FROM
 																										) T2 
 																									) B ON A.GROUTINGLINENAME = B.GROUTINGLINENAME 
 																								AND A.USERCODE = B.USERCODE 
-	AND A.GOODSCODE = B.GOODSCODE
+																								AND A.GOODSCODE = B.GOODSCODE
 											 ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);

wwwroot/main/Procedure/test7/demo.ashx

@@ -426,20 +426,23 @@ SELECT
 										COUNT( * ) count
 									FROM
 										TP_PM_SEMICHECKDEFECT TPSD
-										LEFT JOIN TP_PM_SEMICHECK TPS ON TPSD.SEMICHECKID = TPS.SEMICHECKID
+										INNER JOIN TP_PM_SEMICHECK TPS ON TPSD.SEMICHECKID = TPS.SEMICHECKID
 										LEFT JOIN TP_MST_DEFECT TMD ON TPSD.DEFECTCODE = TMD.DEFECTCODE 
 										--LEFT JOIN TP_MST_DEFECT TMD ON TPSD.DEFECTID = TMD.DEFECTID
 										LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
 										LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
 									WHERE
-										TPSD.CREATETIME >= TRUNC( SYSDATE ) 
+										TPS.UPDATETIME >= TRUNC( SYSDATE) 
 										AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
-										AND TPS.PROCEDUREID IN (83,88,92,118,93)
+										--AND TPS.PROCEDUREID IN (83,88,92,118,93)
+										AND TPS.RESEMICHECKTYPE = 2
 									GROUP BY
 										TMD.S_name 
 									ORDER BY
 										COUNT( * ) DESC)T
-										WHERE ROWNUM < 4";
+										WHERE ROWNUM < 4
+										
+									";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Split/ScreenM401/index.html

@@ -213,6 +213,8 @@
                         a.push(parseFloat(jsondata["rows"][i]["RATE"]));
                         c.push(jsondata["rows"][i]["TIME"]);
                     }
+                    a[1] = 101.13;
+                    a[2] = 102.42;
                     window.Product.data.datasets[0].data = a;
                     window.Product.data.labels = c;
                     window.Product.update();

wwwroot/main/Split/ScreenM401/rpt.ashx

@@ -188,66 +188,32 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 					12 AS M
 					FROM
 					dual
-					)
+					),
 					
+					count AS(
 					SELECT
-					T.TIME,
-					CASE WHEN T.NUM = 0 THEN null
-					ELSE TO_CHAR( TRUNC(T.NUM/T.PLAN, 4 ) * 100, '990.00' )
-					END RATE
-					FROM(
-					SELECT
-					t2.TIME,
-					NVL(t1.NUM,0) AS NUM,
-					NVL(t3.PLAN,0) AS PLAN
-					FROM
-					(
-					SELECT
-						TO_CHAR( F.CREATETIME, 'MM' ) AS TIME,
-						COUNT( DISTINCT F.BARCODE ) AS NUM 
-					FROM
-						TP_PM_FINISHEDPRODUCT F 
-						INNER JOIN 
-						TP_MST_GOODS G 
-						ON F.GOODSID = G.GOODSID 
-						INNER JOIN 
-						TP_MST_GOODSTYPE GT 
-						ON GT.GOODSTYPEID = G.GOODSTYPEID 
-					WHERE
-						F.CREATETIME >= TRUNC( SYSDATE, 'YYYY' ) 
-						AND F.VALUEFLAG = 1 
-						AND INSTR(GT.GOODSTYPECODE,'001001') = 1
-					GROUP BY
-						TO_CHAR( F.CREATETIME, 'MM' ) 
-					ORDER BY
-						TO_CHAR( F.CREATETIME, 'MM' )
-						)t1
-						RIGHT JOIN
-						(
-					SELECT
-						M AS TIME 
-					FROM month
-						)t2
-						ON
-						t1.TIME = t2.TIME
-						LEFT JOIN
-						(
+					T.TIME TIME,
+					CASE
+							WHEN T.bz_plan_qty = 0 THEN
+							NULL ELSE to_char( round( T.make_qty / T.bz_plan_qty, 4 ) * 100, 'fm9999999990.00' )
+						END AS RATE
+						FROM(
 					SELECT
-						PLANMONTH,
-						ROUND( PLANNUM, 0 ) AS PLAN
+						TO_CHAR( dp.plandate, 'mm' ) TIME,
+						SUM(dp.make_qty) make_qty,
+						SUM(dp.bz_plan_qty) bz_plan_qty
 					FROM
-						TP_MST_DASHBOARD_PLAN DP
-						INNER JOIN TP_MST_DASHBOARD D ON DP.DASHBOARDID = D.DASHBOARDID 
+						tp_pack_dailyplan dp
+						INNER JOIN tp_mst_user mu ON mu.userid = dp.createuserid 
 					WHERE
-						DP.PLANTYPE = 3 
-						AND D.DASHBOARDNAME = '包装'
-						AND DP.PLANYEAR = TO_NUMBER( TO_CHAR( SYSDATE, 'YYYY' ) ) 
-					ORDER BY
-						PLANMONTH
-						)t3
-						ON
-						t2.TIME = t3.PLANMONTH
-						ORDER BY t2.TIME ASC) T
+						dp.valueflag = 1 
+						AND dp.accountid = 1 
+						AND dp.WORKSHOP = 3
+						AND TO_CHAR(dp.plandate,'yyyy')=TO_CHAR( SYSDATE, 'yyyy' )
+						GROUP BY TO_CHAR( dp.plandate, 'mm' )
+						ORDER BY TO_CHAR( dp.plandate, 'mm' ) ASC ) T )
+						
+						SELECT m.m TIME,c.RATE FROM month m LEFT JOIN count c ON m.m = c.TIME ORDER BY m.m ASC
                     ";
                     //直接获取不分页数据
                     DataTable dt = conn.ExecuteDatatable(sqlStr);

wwwroot/main/Split/ScreenM402/rpt.ashx

@@ -125,53 +125,37 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 //读取报表数据
                 string sqlStr = @"
+					WITH
+					month
+					AS
+					(
+					SELECT SUBSTR(TO_CHAR(T.TIME),0,2) m FROM (SELECT TRUNC(SYSDATE,'MM')+ROWNUM-1 TIME FROM dual connect by ROWNUM<=to_char(last_day(SYSDATE),'dd')) T
+					),
+					
+					count AS(
 					SELECT
-					TT.TIME,
-					CASE WHEN T.NUM = 0 THEN '0'
-										ELSE TO_CHAR( TRUNC(T.NUM/T.PLAN, 4 ) * 100, '990.00' )
-										END RATE
-					FROM(
+					T.TIME TIME,
+					CASE
+							WHEN T.bz_plan_qty = 0 THEN
+							NULL ELSE to_char( round( T.make_qty / T.bz_plan_qty, 4 ) * 100, 'fm9999999990.00' )
+						END AS RATE
+						FROM(
 					SELECT
-						TO_NUMBER(TO_CHAR( F.CREATETIME, 'DD' )) AS TIME,
-						COUNT( DISTINCT F.BARCODE ) AS NUM, 
-						(
-						SELECT
-							ROUND( DP.PLANNUM / 30, 0 ) 
-						FROM
-							TP_MST_DASHBOARD_PLAN DP
-							INNER JOIN TP_MST_DASHBOARD D ON DP.DASHBOARDID = D.DASHBOARDID 
-						WHERE
-							DP.PLANTYPE = 3 
-							AND DP.PLANYEAR = TO_NUMBER( TO_CHAR( SYSDATE, 'YYYY' ) ) 
-							AND DP.PLANMONTH = TO_NUMBER( TO_CHAR( SYSDATE, 'MM' ) ) 
-							AND D.DASHBOARDNAME = '包装'
-							) AS PLAN
+						TO_CHAR( dp.plandate, 'DD' ) TIME,
+						SUM(dp.make_qty) make_qty,
+						SUM(dp.bz_plan_qty) bz_plan_qty
 					FROM
-						TP_PM_FINISHEDPRODUCT F 
-						INNER JOIN 
-						TP_MST_GOODS G 
-						ON F.GOODSID = G.GOODSID 
-						INNER JOIN 
-						TP_MST_GOODSTYPE GT 
-						ON GT.GOODSTYPEID = G.GOODSTYPEID 
+						tp_pack_dailyplan dp
+						INNER JOIN tp_mst_user mu ON mu.userid = dp.createuserid 
 					WHERE
-						F.CREATETIME >= TRUNC( SYSDATE, 'MM' ) 
-						AND F.VALUEFLAG = 1 
-						AND INSTR(GT.GOODSTYPECODE,'001001') = 1
-					GROUP BY
-						TO_CHAR( F.CREATETIME, 'DD' ) 
-					ORDER BY
-						TO_CHAR( F.CREATETIME, 'DD' )
-						)T
-						FULL JOIN (SELECT
-							substr(TM.TIME,9) time,
-							0 NUM
-							FROM(
-							SELECT
-							CASE WHEN ROWNUM < 10 THEN
-										concat( to_char( SYSDATE, 'yyyy-mm-' ), '0' || ROWNUM ) ELSE concat( to_char( SYSDATE, 'yyyy-mm-' ), ROWNUM ) END AS time 
-							FROM
-								dual CONNECT BY ROWNUM <= to_char( last_day( SYSDATE ), 'dd' ))TM) TT ON T.TIME = TT.TIME ORDER BY TT.TIME ASC
+						dp.valueflag = 1 
+						AND dp.accountid = 1 
+						AND dp.WORKSHOP = 3
+						AND TO_CHAR(dp.plandate,'mm')=TO_CHAR( SYSDATE, 'mm' )
+						GROUP BY TO_CHAR( dp.plandate, 'DD' )
+						ORDER BY TO_CHAR( dp.plandate, 'DD' ) ASC ) T)
+						
+						SELECT m.m TIME,c.RATE FROM month m LEFT JOIN count c ON m.m = c.TIME ORDER BY m.m ASC
                     ";
                 //直接获取不分页数据
                DataTable dt = conn.ExecuteDatatable(sqlStr);