看板调整，耽误时间改为机械手出

wwwroot/main/Procedure/test13/GradingData.ashx

@@ -55,7 +55,7 @@ SELECT
 SELECT
 'Z16' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z16' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z16' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg) countcg,
 sum(T.countyz) countyz,
 sum(T.countlj) countlj
@@ -86,7 +86,7 @@ WHERE
 	SELECT
 'Z17' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z17' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z17' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)
@@ -117,7 +117,7 @@ WHERE
 	SELECT
 'Z18' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z18' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z18' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)
@@ -148,7 +148,7 @@ WHERE
 SELECT
 'Z19' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z19' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z19' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)
@@ -179,7 +179,7 @@ WHERE
 SELECT
 'Z20' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z20' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z20' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)
@@ -210,7 +210,7 @@ WHERE
 SELECT
 'Z21' usercode,
 0 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z21' AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z21' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)
@@ -242,7 +242,7 @@ WHERE
 '汇总' usercode,
 1 num,
 MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE IN ('Z20','Z21','Z19','Z18','Z17','Z16') 
- AND TPPD.CREATETIME >= TRUNC( SYSDATE )) ) AS countj,
+ AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
 sum(T.countlj)

wwwroot/main/Procedure/test14/GlazingBeats.ashx

@@ -428,21 +428,21 @@ public class SmallKanban : IHttpHandler
 											FROM
 												(
 												SELECT
-													ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+													ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 28 AS CZ 
 												FROM
 													TP_PM_PRODUCTIONDATA T 
 												WHERE
-													PROCEDUREID = 39 
+													PROCEDUREID = 40 
 													AND CREATETIME >= (
 														SELECT
 															CREATETIME 
 														FROM
 															TP_PM_PRODUCTIONDATA 
 														WHERE
-															PROCEDUREID = 39 
+															PROCEDUREID = 40 
 															AND CREATETIME >= @LINGDIANRIQI@
 															AND CREATETIME < SYSDATE
-															AND USERCODE = 'JS1'
+															AND USERCODE = 'JS2'
 															FETCH FIRST 1 ROWS ONLY
 														)
 													AND CREATETIME <= (
@@ -451,32 +451,32 @@ public class SmallKanban : IHttpHandler
 														FROM
 															TP_PM_PRODUCTIONDATA 
 														WHERE
-															PROCEDUREID = 39 
+															PROCEDUREID = 40 
 															AND CREATETIME >= @LINGDIANRIQI@
 															AND CREATETIME < @SHIERDIANRIQI@
 															AND CREATETIME <= SYSDATE
-															AND USERCODE = 'JS1'
+															AND USERCODE = 'JS2'
 														ORDER BY CREATETIME DESC
 															FETCH FIRST 1 ROWS ONLY
 														)
-													AND USERCODE = 'JS1' 
+													AND USERCODE = 'JS2' 
 												UNION ALL
 												SELECT
-													ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+													ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 28 AS CZ 
 												FROM
 													TP_PM_PRODUCTIONDATA T 
 												WHERE
-													PROCEDUREID = 39 
+													PROCEDUREID = 40 
 													AND CREATETIME >= (
 														SELECT
 															CREATETIME 
 														FROM
 															TP_PM_PRODUCTIONDATA 
 														WHERE
-															PROCEDUREID = 39 
+															PROCEDUREID = 40 
 															AND CREATETIME >= @SHIERDIANRIQI@
 															AND CREATETIME < SYSDATE
-															AND USERCODE = 'JS1'
+															AND USERCODE = 'JS2'
 															FETCH FIRST 1 ROWS ONLY	
 														)
 													AND CREATETIME <= (
@@ -485,14 +485,14 @@ public class SmallKanban : IHttpHandler
 														FROM
 															TP_PM_PRODUCTIONDATA 
 														WHERE
-															PROCEDUREID = 39 
+															PROCEDUREID = 40 
 															AND CREATETIME >= @SHIERDIANRIQI@
 															AND CREATETIME <= SYSDATE
-															AND USERCODE = 'JS1'
+															AND USERCODE = 'JS2'
 														ORDER BY CREATETIME DESC
 														FETCH FIRST 1 ROWS ONLY
 														)
-													AND USERCODE = 'JS1' 
+													AND USERCODE = 'JS2' 
 												) T 
 											WHERE
 												T.CZ > 0
@@ -552,21 +552,21 @@ public class SmallKanban : IHttpHandler
 					FROM
 						(
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 28 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS1'
+									AND USERCODE = 'JS2'
 									FETCH FIRST 1 ROWS ONLY
 								)
 							AND CREATETIME <= (
@@ -575,32 +575,32 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS1'
+									AND USERCODE = 'JS2'
 								ORDER BY CREATETIME DESC
 									FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS1' 
+							AND USERCODE = 'JS2' 
 						UNION ALL
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 28 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS1'
+									AND USERCODE = 'JS2'
 									FETCH FIRST 1 ROWS ONLY	
 								)
 							AND CREATETIME <= (
@@ -609,14 +609,14 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS1'
+									AND USERCODE = 'JS2'
 								ORDER BY CREATETIME DESC
 								FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS1' 
+							AND USERCODE = 'JS2' 
 						) T 
 					WHERE
 						T.CZ > 0

wwwroot/main/Procedure/test15/GlazingBeats2.ashx

@@ -430,21 +430,21 @@ public class SmallKanban : IHttpHandler
 					FROM
 						(
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 27 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 									FETCH FIRST 1 ROWS ONLY
 								)
 							AND CREATETIME <= (
@@ -453,32 +453,32 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 								ORDER BY CREATETIME DESC
 									FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS4' 
+							AND USERCODE = 'JS5' 
 						UNION ALL
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 27 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 									FETCH FIRST 1 ROWS ONLY	
 								)
 							AND CREATETIME <= (
@@ -487,14 +487,14 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 								ORDER BY CREATETIME DESC
 								FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS4' 
+							AND USERCODE = 'JS5' 
 						) T 
 					WHERE
 						T.CZ > 0
@@ -554,21 +554,21 @@ public class SmallKanban : IHttpHandler
 					FROM
 						(
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 27 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 									FETCH FIRST 1 ROWS ONLY
 								)
 							AND CREATETIME <= (
@@ -577,32 +577,32 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @LINGDIANRIQI@
 									AND CREATETIME < @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 								ORDER BY CREATETIME DESC
 									FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS4' 
+							AND USERCODE = 'JS5' 
 						UNION ALL
 						SELECT
-							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 26 AS CZ 
+							ROUND( TO_NUMBER( (T.CREATETIME) - LAG (T.CREATETIME) OVER ( ORDER BY T.CREATETIME ) ) * 86400 ) - 27 AS CZ 
 						FROM
 							TP_PM_PRODUCTIONDATA T 
 						WHERE
-							PROCEDUREID = 39 
+							PROCEDUREID = 40 
 							AND CREATETIME >= (
 								SELECT
 									CREATETIME 
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME < SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 									FETCH FIRST 1 ROWS ONLY	
 								)
 							AND CREATETIME <= (
@@ -611,14 +611,14 @@ public class SmallKanban : IHttpHandler
 								FROM
 									TP_PM_PRODUCTIONDATA 
 								WHERE
-									PROCEDUREID = 39 
+									PROCEDUREID = 40 
 									AND CREATETIME >= @SHIERDIANRIQI@
 									AND CREATETIME <= SYSDATE
-									AND USERCODE = 'JS4'
+									AND USERCODE = 'JS5'
 								ORDER BY CREATETIME DESC
 								FETCH FIRST 1 ROWS ONLY
 								)
-							AND USERCODE = 'JS4' 
+							AND USERCODE = 'JS5' 
 						) T 
 					WHERE
 						T.CZ > 0