样式调整

wwwroot/main/Procedure/Boardkanban/Boardkanban.ashx

@@ -65,7 +65,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USERSTAFF TMUS ON TPPD.USERID = TMUS.USERID
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
-												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												TPPD.PROCEDUREID IN ( 16,47 ) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -85,7 +85,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USERSTAFF TMUS ON TPPD.USERID = TMUS.USERID
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
-												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												TPPD.PROCEDUREID IN ( 16,47 ) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -105,7 +105,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USERSTAFF TMUS ON TPPD.USERID = TMUS.USERID
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
-												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												TPPD.PROCEDUREID IN ( 16,47 ) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -119,27 +119,6 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-        	if (context.Request["m"].ToString() == "WorkshopSection")
-			{
-				string sqlStr = @"
-                SELECT
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A'THEN 1 ELSE 0 END  ) 成型A交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B'THEN 1 ELSE 0 END  ) 成型B交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C'THEN 1 ELSE 0 END  ) 成型C交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=1 	 AND  gdd.DELIVERFLAG = '1' THEN 1 ELSE 0 END  ) 高压交坯数量
-                        FROM TP_PM_GROUTINGDAILYDETAIL GDD
-                        LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDD.GROUTINGLINEID
-                        WHERE gdd.VALUEFLAG=1 and gd.VALUEFLAG=1
-                        AND gdd.GROUTINGFLAG=1 ";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-			}
             
 				if (context.Request["m"].ToString() == "MonthSum")
 							{
@@ -204,7 +183,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 																				WHERE 打磨 is not null	 
 							
 							
-																				union to
+																				union all
 											 
 													SELECT
 													*
@@ -439,7 +418,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -466,7 +445,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+													PD.GROUTINGLINECODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -482,7 +461,6 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
-														AND TMDP.DEFECTPROCEDUREID IN (4,5,53,54)
 														
 											)";
                 //直接获取不分页数据

wwwroot/main/Procedure/Boardkanban/Boardkanban.html

@@ -40,13 +40,13 @@
                         <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧产量：<span id="ydm">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧产量：<span id="ydm"  style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">综合产量：<span id="ycx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">综合产量：<span id="ycx"  style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧出窑量：<span id="ygx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧出窑量：<span id="ygx"   style="color:white;">测试数据</span></td>
                     </tr>
                 </table>
             </div>
@@ -55,7 +55,7 @@
                 <div style="width: 100%; height: 530px; ">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:50%;">
                         <tr class="tr_title_warning">
-                            <td colspan="7" style="font-size:30px">成品检验个人数据</td>
+                            <td colspan="7" style="font-size: 30px; color: white;">成品检验个人数据</td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 30px; font-size:27px">
                             <td style="width: 15%;">工号</td>
@@ -70,12 +70,12 @@
                         <table style="width: 50%; display:none;" id="StaffTable_template">
                             <!--style=""-->
                             <tr class="tr_title_warning" style="height: 30px; font-size: 20px">
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号2}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量2}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; text-align: left ">{工号}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; ">{数量}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; text-align: left ">{工号1}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; ">{数量1}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; text-align: left ">{工号2}</td>
+                                <td style="font-size: 15px; color: white; height: 30px; width: 16%; ">{数量2}</td>
                             </tr>
                         </table>
                         <table id="StaffTable" style="width: 50%;">
@@ -84,8 +84,9 @@
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 50%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size: 30px">
-                            <td colspan="3" id="dmqxl">缺陷率：——%</td>
-                            <td colspan="3" id="cxqxl">一烧产量：——</td>
+                            <td colspan="3" >缺陷率：<span id="dmqxl" style="color:white;">——</span></td>
+                            <td colspan="3" >一烧产量：<span id="cxqxl" style="color:white">——</span></td>
+
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 50px; font-size: 25px">
                             <td>缺陷</td>
@@ -156,6 +157,7 @@
 
         //页面加载
         $(document).ready(function () {
+            initData();
             timeUp();
 			doGetData = setInterval(function () { loadServerTime(); }, 3000);
            doGetData = setInterval(function () { timeUp(); }, 10000);
@@ -164,25 +166,22 @@
 
         function timeUp() {
 			loadData();
-			initData();
-			clearData();
 			StaffTable();
 			DefectDetails();
 			Alltotal();
 			MonthSum();
         }
 		function Alltotal() {
-			$.get('RefinementKanban.ashx?m=Alltotal', function (data) {
+			$.get('Boardkanban.ashx?m=Alltotal', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-                    $('#scl').text("一烧出窑数：" + json["rows"][0]["出窑数"]);
-					$('#dmqxl').text("一烧出窑数：" + json["rows"][0]["打磨缺陷率"]);
-					$('#cxqxl').text("一烧出窑数：" + json["rows"][0]["擦洗缺陷率"]);
+					$('#dmqxl').text(json["rows"][0]["打磨缺陷率"]);
+                    $('#cxqxl').text( json["rows"][0]["出窑数"]);
 				}
 			});
         }
 		function MonthSum() {
-			$.get('RefinementKanban.ashx?m=MonthSum', function (data) {
+			$.get('Boardkanban.ashx?m=MonthSum', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
                     $('#ydm').text( json["rows"][0]["打磨"]);
@@ -198,34 +197,14 @@
 				function () {
 					$(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
 					if (--StaffTableRowCount > -1) {
-					} else {
+                    } else {
+                        clearInterval(StaffInterval);
 						StaffTable();
 					}
 				}
 			);
         }
-		function StaffTable() {
-			clearInterval(StaffInterval);
-			$.get("RefinementKanban.ashx?m=StaffTable", function (data) {
-				var json = JSON.parse(data);
-				if (json["success"] == true) {
-					$("#StaffTable").html("");
-					for (var i = 0; i < json["rows"].length; i++) {
-						var temp = $("#StaffTable_template").html();
-						temp = temp.replace("<tbody>", "").replace("</tbody>", "");
-						temp = temp.replace('{工号}', json["rows"][i]['STAFFCODE']);
-						temp = temp.replace('{数量}', json["rows"][i]['COUNTS']);
-						temp = temp.replace('{工号1}', json["rows"][i]['STAFFCODE1']);
-                        temp = temp.replace('{数量1}', json["rows"][i]['COUNTS1']);
-						temp = temp.replace('{工号2}', json["rows"][i]['STAFFCODE2']);
-						temp = temp.replace('{数量2}', json["rows"][i]['COUNTS2']);
-						$("#StaffTable").append(temp);
-					}
-					StaffTableRowCount = json["rows"].length;
-					StaffInterval = setInterval(StaffTableScroll, 3000);
-				}
-			});
-		}
+	
         //表格滚动
         function dayTableScroll() {
 			var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
@@ -236,14 +215,38 @@
                         dayTableRowCount--;
 						console.log(dayTableRowCount);
                     } else {
+                        clearInterval(dayInterval);
                         loadDayTable();
                     }
                 }
             );
         }
+
+        function StaffTable() {
+            clearInterval(StaffInterval);
+            $.get("Boardkanban.ashx?m=StaffTable", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    $("#StaffTable").html("");
+                    for (var i = 0; i < json["rows"].length; i++) {
+                        var temp = $("#StaffTable_template").html();
+                        temp = temp.replace("<tbody>", "").replace("</tbody>", "");
+                        temp = temp.replace('{工号}', json["rows"][i]['STAFFCODE']);
+                        temp = temp.replace('{数量}', json["rows"][i]['COUNTS']);
+                        temp = temp.replace('{工号1}', json["rows"][i]['STAFFCODE1']);
+                        temp = temp.replace('{数量1}', json["rows"][i]['COUNTS1']);
+                        temp = temp.replace('{工号2}', json["rows"][i]['STAFFCODE2']);
+                        temp = temp.replace('{数量2}', json["rows"][i]['COUNTS2']);
+                        $("#StaffTable").append(temp);
+                    }
+                    StaffTableRowCount = json["rows"].length;
+                    StaffInterval = setInterval(StaffTableScroll, 3000);
+                }
+            });
+        }
         //明细表
 		function loadDayTable() {
-			$.get("RefinementKanban.ashx?m=MonthTable", function (data) {
+			$.get("Boardkanban.ashx?m=MonthTable", function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$("#dayTable").html("");
@@ -271,7 +274,7 @@
             window.DayCL.update();
         }
 		function loadServerTime() {
-			$.get('RefinementKanban.ashx?m=fwq', function (data) {
+			$.get('Boardkanban.ashx?m=fwq', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#sj').html(json["sj"]);
@@ -279,7 +282,7 @@
 			});
 		}
 		function DefectDetails() {
-			$.get('RefinementKanban.ashx?m=DefectDetail', function (data) {
+			$.get('Boardkanban.ashx?m=DefectDetail', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
@@ -304,7 +307,7 @@
 			});
 		}
         function loadData() {
-			$.get("RefinementKanban.ashx?m=rate", function (data) {
+			$.get("Boardkanban.ashx?m=rate", function (data) {
                 clearData();
                 var json = JSON.parse(data);
                 if (json["success"] == true) {

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.ashx

@@ -85,11 +85,11 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USERSTAFF TMUS ON TPPD.USERID = TMUS.USERID
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
-												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												TPPD.PROCEDUREID IN ( 13,14,55,56 ) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
-										) U2 ON U1.ID = ( U2.ID - 1 )
+										) U2 ON U1.ID = ( U2.ID - 0 )
 										LEFT JOIN (
 										SELECT ROWNUM AS
 											ID,
@@ -109,7 +109,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
-										) U3 ON U2.ID = ( U3.ID - 1 ) 
+										) U3 ON U2.ID = ( U3.ID - 0 ) 
 									WHERE
 									mod( U1.id, 3 ) = 1 
 									) UU";
@@ -119,27 +119,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-        	if (context.Request["m"].ToString() == "WorkshopSection")
-			{
-				string sqlStr = @"
-                SELECT
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A'THEN 1 ELSE 0 END  ) 成型A交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B'THEN 1 ELSE 0 END  ) 成型B交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C'THEN 1 ELSE 0 END  ) 成型C交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=1 	 AND  gdd.DELIVERFLAG = '1' THEN 1 ELSE 0 END  ) 高压交坯数量
-                        FROM TP_PM_GROUTINGDAILYDETAIL GDD
-                        LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDD.GROUTINGLINEID
-                        WHERE gdd.VALUEFLAG=1 and gd.VALUEFLAG=1
-                        AND gdd.GROUTINGFLAG=1 ";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-			}
+       
             
 				if (context.Request["m"].ToString() == "MonthSum")
 							{
@@ -204,7 +184,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 																				WHERE 打磨 is not null	 
 							
 							
-																				union to
+																				union all
 											 
 													SELECT
 													*
@@ -345,8 +325,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
-														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
+														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56)
 														AND dfc.VALUEFLAG = 1 
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -385,8 +364,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
-														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
+														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56)
 														AND dfc.VALUEFLAG = 1 
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -400,7 +378,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -427,28 +405,19 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												FROM TP_PM_DEFECT dfc
 												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 												WHERE dfc.VALUEFLAG=1
-												AND dfc.DEFECTPROCEDUREID IN(4,53)
-												),
-												擦洗 AS (
-											SELECT
-												COUNT(dfc.BARCODE) 缺陷数量
-												FROM TP_PM_DEFECT dfc
-												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
-												WHERE dfc.VALUEFLAG=1
-												AND dfc.DEFECTPROCEDUREID IN(5,54)
+												AND dfc.DEFECTPROCEDUREID IN(10,37,41)
 												),
+											
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
-												DECODE( NVL( 打磨.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 打磨.缺陷数量, 0 ) / DECODE( NVL( 检验数.出窑数, 1 ), 0, 1, NVL( 检验数.出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) as 打磨缺陷率,
-												DECODE( NVL( 擦洗.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 擦洗.缺陷数量, 0 ) / DECODE( NVL( 检验数.出窑数, 1 ), 0, 1, NVL( 检验数.出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) as 擦洗缺陷率
+												DECODE( NVL( 打磨.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 打磨.缺陷数量, 0 ) / DECODE( NVL( 检验数.出窑数, 1 ), 0, 1, NVL( 检验数.出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) as 缺陷率
 												FROM  
 												打磨
-												LEFT JOIN 检验数 on 1=1
-												LEFT JOIN 擦洗 on 1=1";
+												LEFT JOIN 检验数 on 1=1";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -482,9 +451,9 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
-														AND TMDP.DEFECTPROCEDUREID IN (4,5,53,54)
-														
-											)";
+														AND TMDP.DEFECTPROCEDUREID IN (55,56,45,13,14,39)
+											)
+													";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -493,13 +462,13 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 
 		if (context.Request["m"].ToString() == "rate")//折线图
 			{
-				string sqlStr = @"WITH 打磨 AS(
+				string sqlStr = @"WITH 入库 AS(
 								SELECT
 													*
 													FROM(
 													select 
 													pdg.SJ,
-													  SUM(pdg.A313 +pdg.A21)   打磨
+													  SUM(pdg.A313 +pdg.A21)   入库
 													 from ( select 
 															pdata.SJ,			
 															pdata.productionlineid,
@@ -520,8 +489,8 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														   g.goodsspecification,
 														   g.GOODSMODEL,
 														   dd.dictionaryvalue GLAZETYPE
-													, sum(decode(pd.procedureid, 53, 1, 0)) as A313
-													, sum(decode(pd.procedureid, 4, 1, 0)) as A21
+													, sum(decode(pd.procedureid, 11, 1, 0)) as A313
+													, sum(decode(pd.procedureid, 0, 1, 0)) as A21
 													  from tp_pm_productiondata pd
 													 inner join tp_mst_goods g
 														on g.goodsid = pd.goodsid
@@ -561,12 +530,12 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 							
 																				
 ),
-擦洗 AS (SELECT
+装窑 AS (SELECT
 													*
 													FROM(
 													select 
 													pdg.SJ,
-													  SUM(pdg.A313 +pdg.A21)   擦洗
+													  SUM(pdg.A313 +pdg.A21)   装窑
 													 from ( select 
 															pdata.SJ,			
 															pdata.productionlineid,
@@ -587,8 +556,8 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														   g.goodsspecification,
 														   g.GOODSMODEL,
 														   dd.dictionaryvalue GLAZETYPE
-													, sum(decode(pd.procedureid, 54, 1, 0)) as A313
-													, sum(decode(pd.procedureid, 5,1 , 0)) as A21
+													, sum(decode(pd.procedureid, 13, 1, 0)) as A313
+													, sum(decode(pd.procedureid, 55,1 , 0)) as A21
 													  from tp_pm_productiondata pd
 													 inner join tp_mst_goods g
 														on g.goodsid = pd.goodsid
@@ -626,82 +595,15 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 																				ORDER BY pdg.SJ
 														)
 						
-							),
-							改洗 AS (
-															SELECT
-													*
-													FROM(
-													select 
-													pdg.SJ,
-													  SUM(pdg.A313 +pdg.A21)   改洗
-													 from ( select 
-															pdata.SJ,			
-															pdata.productionlineid,
-														   pdata.goodstypename2,
-														   pdata.goodstypename,
-														   pdata.goodscode,
-														   pdata.goodsspecification,
-														   pdata.GOODSMODEL,
-														   pdata.GLAZETYPE
-													, sum(pdata.A313) as A313
-													, sum(pdata.A21) as A21
-													  from (  select
-															TO_CHAR(pd.CREATETIME,'MM-DD')AS SJ,
-														   pd.productionlineid,
-														   gt2.goodstypename goodstypename2,
-														   gt.goodstypename,
-														   g.goodscode,
-														   g.goodsspecification,
-														   g.GOODSMODEL,
-														   dd.dictionaryvalue GLAZETYPE
-													, sum(decode(pd.procedureid, 36, 1, 0)) as A313
-													, sum(decode(pd.procedureid, 5, 0, 0)) as A21
-													  from tp_pm_productiondata pd
-													 inner join tp_mst_goods g
-														on g.goodsid = pd.goodsid
-													 inner join tp_mst_goodstype gt
-														on gt.goodstypeid = g.goodstypeid
-													 inner join tp_mst_goodstype gt2
-														on gt2.goodstypecode = substr(gt.goodstypecode, 0, 6)
-													   and gt2.accountid = gt.accountid
-													 inner join tp_mst_datadictionary dd
-														on dd.dictionaryid = g.GLAZETYPEID
-													 where pd.valueflag = '1'
-													   and pd.accountid = '1'
-													AND pd.CREATETIME 	 >= ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25  AND pd.CREATETIME < ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25
-														AND exists (Select 1  from TP_MST_UserPurview up where up.PurviewType= 7 and (up.PurviewID = -1 or up.PurviewID= pd.ProductionLineId)) group by
-														TO_CHAR(pd.CREATETIME,'MM-DD'), 
-														   pd.productionlineid,
-														   gt2.goodstypename,
-														   gt.goodstypename,
-														   g.goodscode,
-														   g.goodsspecification,
-														   g.GOODSMODEL,
-														   dd.dictionaryvalue
-													 order by gt2.goodstypename, g.goodscode ) pdata
-													 group by 
-													pdata. SJ,
-													  pdata.productionlineid,
-														   pdata.goodstypename2,
-														   pdata.goodstypename,
-														   pdata.goodscode,
-														   pdata.goodsspecification,
-														   pdata.GOODSMODEL,
-														   pdata.GLAZETYPE
-													 ) pdg
-													 							GROUP BY pdg.SJ
-																				ORDER BY pdg.SJ
-														)
-														)
-
+							)
+														
 														SELECT
-														打磨.SJ,
-														打磨.打磨,
-														擦洗.擦洗,
-														改洗.改洗
-														FROM 擦洗
-														LEFT JOIN 打磨 ON 打磨.SJ=擦洗.SJ
-														LEFT JOIN 改洗 ON 改洗.SJ=打磨.SJ";
+														入库.SJ,
+														入库.入库,
+														装窑.装窑
+														FROM 装窑
+														LEFT JOIN 入库 ON 入库.SJ=装窑.SJ
+";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.html

@@ -37,16 +37,16 @@
             <div>
                 <table rules="none" align="right" style="width: 20%; height: 270px; margin-left:80%;margin-top:-291px ">
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
+                        <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">装窑：<span id="ydm">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">装窑：<span id="ydm" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">白坯入库：<span id="ycx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">白坯入库：<span id="ycx" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">自坏库存：<span id="ygx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">白坏库存：<span id="ygx" style="color:white;">测试数据</span></td>
                     </tr>
                 </table>
             </div>
@@ -55,7 +55,7 @@
                 <div style="width: 100%; height: 530px; ">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:50%;">
                         <tr class="tr_title_warning">
-                            <td colspan="7" style="font-size:30px">烧成工序装窑、出窑个人数据</td>
+                            <td colspan="7" style="font-size: 30px; color: white;">烧成工序装窑、出窑个人数据</td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 30px; font-size:27px">
                             <td style="width: 15%;">工号</td>
@@ -70,12 +70,12 @@
                         <table style="width: 50%; display:none;" id="StaffTable_template">
                             <!--style=""-->
                             <tr class="tr_title_warning" style="height: 30px; font-size: 20px">
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号2}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量2}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号1}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量1}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号2}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量2}</td>
                             </tr>
                         </table>
                         <table id="StaffTable" style="width: 50%;">
@@ -84,8 +84,8 @@
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 50%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size: 30px">
-                            <td colspan="3" id="dmqxl">施釉缺陷率：——%</td>
-                            <td colspan="3" id="cxqxl">一烧产量：——</td>
+                            <td colspan="3" >施釉缺陷率：<span id="dmqxl" style="color:white">——</span></td>
+                            <td colspan="3" >一烧产量：<span id="cxqxl" style="color:white">——</span></td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 50px; font-size: 25px">
                             <td>缺陷</td>
@@ -157,6 +157,7 @@
         //页面加载
         $(document).ready(function () {
             timeUp();
+            initData();
 			doGetData = setInterval(function () { loadServerTime(); }, 3000);
            doGetData = setInterval(function () { timeUp(); }, 10000);
            loadDayTable();
@@ -164,25 +165,23 @@
 
         function timeUp() {
 			loadData();
-			initData();
-			clearData();
 			StaffTable();
 			DefectDetails();
 			Alltotal();
 			MonthSum();
         }
 		function Alltotal() {
-			$.get('RefinementKanban.ashx?m=Alltotal', function (data) {
+			$.get('BurnIntoKanban.ashx?m=Alltotal', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-                    $('#scl').text("一烧出窑数：" + json["rows"][0]["出窑数"]);
-					$('#dmqxl').text("一烧出窑数：" + json["rows"][0]["打磨缺陷率"]);
-					$('#cxqxl').text("一烧出窑数：" + json["rows"][0]["擦洗缺陷率"]);
+                    $('#cxqxl').text("一烧出窑数：" + json["rows"][0]["出窑数"]);
+                    $('#dmqxl').text("一烧出窑数：" + json["rows"][0]["缺陷率"]);
+
 				}
 			});
         }
 		function MonthSum() {
-			$.get('RefinementKanban.ashx?m=MonthSum', function (data) {
+			$.get('BurnIntoKanban.ashx?m=MonthSum', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
                     $('#ydm').text( json["rows"][0]["打磨"]);
@@ -199,14 +198,15 @@
 					$(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
 					if (--StaffTableRowCount > -1) {
 					} else {
-						StaffTable();
+                        clearInterval(StaffInterval);
+                        StaffTable();
 					}
 				}
 			);
         }
 		function StaffTable() {
 			clearInterval(StaffInterval);
-			$.get("RefinementKanban.ashx?m=StaffTable", function (data) {
+			$.get("BurnIntoKanban.ashx?m=StaffTable", function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$("#StaffTable").html("");
@@ -236,14 +236,16 @@
                         dayTableRowCount--;
 						console.log(dayTableRowCount);
                     } else {
+                        clearInterval(dayInterval);
                         loadDayTable();
+                        
                     }
                 }
             );
         }
         //明细表
 		function loadDayTable() {
-			$.get("RefinementKanban.ashx?m=MonthTable", function (data) {
+			$.get("BurnIntoKanban.ashx?m=MonthTable", function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$("#dayTable").html("");
@@ -271,7 +273,7 @@
             window.DayCL.update();
         }
 		function loadServerTime() {
-			$.get('RefinementKanban.ashx?m=fwq', function (data) {
+			$.get('BurnIntoKanban.ashx?m=fwq', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#sj').html(json["sj"]);
@@ -279,7 +281,7 @@
 			});
 		}
 		function DefectDetails() {
-			$.get('RefinementKanban.ashx?m=DefectDetail', function (data) {
+			$.get('BurnIntoKanban.ashx?m=DefectDetail', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
@@ -304,14 +306,14 @@
 			});
 		}
         function loadData() {
-			$.get("RefinementKanban.ashx?m=rate", function (data) {
+			$.get("BurnIntoKanban.ashx?m=rate", function (data) {
                 clearData();
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     for (var n = 0; n < json["rows"].length; n++) {
                         window.DayCL.data.labels.push(json["rows"][n]["SJ"]);
-                        window.DayCL.data.datasets[0].data[n] = (json["rows"][n]["打磨"]);
-                        window.DayCL.data.datasets[1].data[n] = (json["rows"][n]["擦洗"]);
+                        window.DayCL.data.datasets[0].data[n] = (json["rows"][n]["入库"]);
+                        window.DayCL.data.datasets[1].data[n] = (json["rows"][n]["装窑"]);
                     }
                     }
                     window.DayCL.update();

wwwroot/main/Procedure/FormingKanban/FormingKanban.ashx

@@ -10,39 +10,47 @@ using System.Web;
 using System.Web.SessionState;
 public class FormingKanban : IHttpHandler, IReadOnlySessionState
 {
-    public void ProcessRequest(HttpContext context)
-    {
-        context.Response.ContentType = "text/plain";
-        using (IDataAccess conn = DataAccess.Create())
-        {
-						//折线图
-			 
-            if (context.Request["m"].ToString() == "WorkshopSection")
-            {
-                string sqlStr = @"
+	public void ProcessRequest(HttpContext context)
+	{
+		context.Response.ContentType = "text/plain";
+		using (IDataAccess conn = DataAccess.Create())
+		{
+			if (context.Request["m"].ToString() == "fwq")
+			{
+				string time = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm ");
+				Dictionary<string, string> d = new Dictionary<string, string>();
+				JObject json = new JObject(
+						  new JProperty("success", true),
+						  new JProperty("sj", time)
+						);
+				context.Response.Write(json.ToString());
+			}
+
+			if (context.Request["m"].ToString() == "WorkshopSection")
+			{
+				string sqlStr = @"
                  SELECT
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A'THEN 1 ELSE 0 END  ) 成型A交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B'THEN 1 ELSE 0 END  ) 成型B交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C'THEN 1 ELSE 0 END  ) 成型C交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=1 	 AND  gdd.DELIVERFLAG = '1' THEN 1 ELSE 0 END  ) 高压交坯数量
-                        FROM TP_PM_GROUTINGDAILYDETAIL GDD
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	and gdd.PROCEDUREID=7 AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A'THEN 1 ELSE 0 END  ) 成型A交坯数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 and gdd.PROCEDUREID=7 AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B'THEN 1 ELSE 0 END  ) 成型B交坯数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 and gdd.PROCEDUREID=7 AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C'THEN 1 ELSE 0 END  ) 成型C交坯数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDD.CREATETIME) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=1 	 and gdd.PROCEDUREID=7 THEN 1 ELSE 0 END  ) 高压交坯数量
+                        FROM TP_PM_PRODUCTIONDATA GDD
                         LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDD.GROUTINGLINEID
                         WHERE gdd.VALUEFLAG=1 and gd.VALUEFLAG=1
-                        AND gdd.GROUTINGFLAG=1
-						AND TRUNC( GDD.GROUTINGDATE ) = trunc(sysdate) 
-						AND TRUNC( GDD.delivertime ) = trunc(sysdate)  ";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-            }
-			   if (context.Request["m"].ToString() == "rate")
-            {
-                string sqlStr = @"WITH 交坯 AS(SELECT
+
+ ";
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
+			if (context.Request["m"].ToString() == "rate")
+			{
+				string sqlStr = @"WITH 交坯 AS(SELECT
 													*
 													FROM(
 													select 
@@ -127,14 +135,14 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														CASE WHEN 注浆.注浆 is null THEN 0 else 注浆.注浆 end AS 注浆
 														FROM 注浆
 														RIGHT JOIN 交坯 ON 交坯.SJ=注浆.SJ  ";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-            }
-            if (context.Request["m"].ToString() == "Alltotal")
-            {
-                string sqlStr = @"with 半检缺陷 AS (
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
+			if (context.Request["m"].ToString() == "Alltotal")
+			{
+				string sqlStr = @"with 半检缺陷 AS (
 												SELECT
 												COUNT(df.BARCODE) 缺陷数量
 												FROM TP_PM_DEFECT df
@@ -145,8 +153,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
-												 AND TRUNC( CREATETIME ) = trunc(sysdate) 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -154,15 +161,15 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												FROM  
 												半检缺陷
 												LEFT JOIN 检验数 on 1=1";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-            }
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
 
-				if (context.Request["m"].ToString() == "MonthSum")
-							{
-								string sqlStr = @"SELECT
+			if (context.Request["m"].ToString() == "MonthSum")
+			{
+				string sqlStr = @"SELECT
 															*
 															FROM(
 															select 
@@ -229,15 +236,15 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 															AND GROUTINGFLAG=1
 															AND SCRAPFLAG=0 
 															AND GROUTINGDATE >= ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25  AND GROUTINGDATE < ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 2) + 25";
-								//直接获取不分页数据
-								DataTable dt = conn.ExecuteDatatable(sqlStr);
-								string jsonStr = new JsonResult(dt).ToJson();
-								context.Response.Write(jsonStr);
-							}
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
 
-            if (context.Request["m"].ToString() == "DefectDetail")
-            {
-                string sqlStr = @"WITH 缺陷 AS (
+			if (context.Request["m"].ToString() == "DefectDetail")
+			{
+				string sqlStr = @"WITH 缺陷 AS (
 												SELECT
 													缺陷名称,
 													缺陷数量 
@@ -306,7 +313,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														ROWNUM <= 4 
 													) 
 												),
-												检验数 AS ( SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 	AND TRUNC( CREATETIME ) = trunc(sysdate)  ) SELECT
+												检验数 AS ( SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1  ) SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
 												其他缺陷.其他缺陷数量,
@@ -336,15 +343,15 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												缺陷
 												LEFT JOIN 检验数 ON 1 = 1
 												LEFT JOIN 其他缺陷 ON 1 =1";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-            }
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
 
-            if (context.Request["m"].ToString() == "MonthTable")
-            {
-                string sqlStr = @"
+			if (context.Request["m"].ToString() == "MonthTable")
+			{
+				string sqlStr = @"
 
 									SELECT
 										责任工号,
@@ -355,7 +362,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+													pd.GROUTINGLINECODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -373,30 +380,30 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  )";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-            }
+				//直接获取不分页数据
+				DataTable dt = conn.ExecuteDatatable(sqlStr);
+				string jsonStr = new JsonResult(dt).ToJson();
+				context.Response.Write(jsonStr);
+			}
+
 
-        
-        }
-    }
+		}
+	}
 
-    public decimal toNumber(object o)
-    {
-        if (o != DBNull.Value)
-            return Convert.ToDecimal(o);
-        else
-            return 0;
-    }
+	public decimal toNumber(object o)
+	{
+		if (o != DBNull.Value)
+			return Convert.ToDecimal(o);
+		else
+			return 0;
+	}
 
-    public bool IsReusable
-    {
-        get
-        {
-            return false;
-        }
-    }
+	public bool IsReusable
+	{
+		get
+		{
+			return false;
+		}
+	}
 
 }

wwwroot/main/Procedure/FormingKanban/FormingKanban.html

@@ -28,49 +28,49 @@
 
             <!--31天产量曲线图-->
             <div style="width:1840px;height:30%;display:flex;flex-direction:row;">
-                <div style="width: 75%; height: 300px;">
+                <div style="width: 80%; height: 300px;">
                     <div style="color:white;font-size:15px;font-weight:600; text-align:center">每日产量计划达成</div>
-                    <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 330px; width: 80% "></canvas>
+                    <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 330px; width: 90% "></canvas>
                 </div>
             </div>
 
             <div>
                 <table rules="none" align="right" style="width: 20%; height: 270px; margin-left:80%;margin-top:-291px ">
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
+                        <td style="width: 12%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 140px; font-size: 30px; text-align: left ">月交·<div  style="text-align: center; font-size: 30px; " id="yjp">测试数据</div>坯量·</td>
+                        <td style="width: 12%; height: 140px; font-size: 35px; text-align: left ">月交坯量：<span style="text-align: center; color: white; font-size: 50px; " id="yjp">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 140px; font-size: 30px; text-align: left ">月注·<div  style="text-align: center; font-size: 30px; " id="yzj">测试数据</div class="tr_title_warning">浆量·</td>
+                        <td style="width: 12%; height: 140px; font-size: 35px; text-align: left ">月注浆量：<span style="text-align: center; color: white; font-size: 50px; " id="yzj">测试数据</span></td>
                     </tr>
                 </table>
             </div>
             <!--表格-->
-            <div style="width: 100%; height: 530px; display: flex; flex-direction: row; margin-top: 3%">
+            <div style="width: 100%; height: 530px; display: flex; flex-direction: row; margin-top: 4%">
                 <div style="width: 50%; height: 530px; padding-right: 20px;">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size:27px">
                             <td rowspan="2">成型A </td>
-                            <td clospan="2" style="text-align :left " id="cxaj">交坯量：0</td>
+                            <td clospan="2" style="text-align :left " ><span id="cxaj" style="color:white;">交坯量：0</span></td>
                             <td rowspan="2">成型B</td>
-                            <td clospan="2" style="text-align :left" id="cxbj">交坯量：0</td>
+                            <td clospan="2" style="text-align :left"><span id="cxbj" style="color:white;">交坯量：0</span></td>
                         </tr>
 
                         <tr class="tr_title_warning" style="height: 60px; font-size: 27px">
-                            <td clospan="2" style="text-align :left" id="cxaz">注浆量：0</td>
-                            <td clospan="2" style="text-align :left" id="cxbz">注浆量：0</td>
+                            <td clospan="2" style="text-align :left"><span id="cxaz" style="color:white;">注浆量：0</span></td>
+                            <td clospan="2" style="text-align :left" ><span id="cxbz" style="color:white;">注浆量：0</span></td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 60px; font-size: 27px">
                             <td rowspan="2">成型C </td>
-                            <td clospan="2" style="text-align :left" id="cxcj">交坯量：0</td>
+                            <td clospan="2" style="text-align :left" ><span id="cxcj" style="color:white;">交坯量：0</span></td>
                             <td rowspan="2">高压</td>
-                            <td clospan="2" style="text-align :left" id="gyj">交坯量：0</td>
+                            <td clospan="2" style="text-align :left" ><span id="gyj" style="color:white;">交坯量：0</span></td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 60px; font-size: 27px">
-                            <td clospan="2" style="text-align :left" id="cxcz">注浆量：0</td>
-                            <td clospan="2" style="text-align :left" id="gyz">注浆量： 0</td>
+                            <td clospan="2" style="text-align :left" ><span id="cxcz" style="color:white;">注浆量：0</span></td>
+                            <td clospan="2" style="text-align :left" ><span id="gyz" style="color:white;">注浆量：0</span></td>
                         </tr>
                     </table>
 
@@ -150,7 +150,7 @@
             initData();
             MonthSum();
             clearData();
-            loadServerTime();
+            doGetData = setInterval(function () { loadServerTime();}, 1000);
             doGetData = setInterval(function () { timeUpdate(); }, 1000);
              loadDayTable();
         });
@@ -206,6 +206,7 @@
                 Alltotal();
 				WorkshopSections();
                 DefectDetails();
+                loadData();
 				currentTime1 = refreshTime1;
 			}
 			else {
@@ -228,7 +229,7 @@
        
 
 		function loadServerTime() {
-			$.get('ServerTime.ashx?m=fwq', function (data) {
+            $.get('FormingKanban.ashx?m=fwq', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#sj').html(json["sj"]);
@@ -254,7 +255,8 @@
 		function DefectDetails() {
 			$.get('FormingKanban.ashx?m=DefectDetail', function (data) {
 				var json = JSON.parse(data);
-				if (json["success"] == true) {
+                if (json["success"] == true) {
+                    if (json["rows"].length<0) {
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
 					$('#qxname2').text(json["rows"][1]["缺陷名称"]);
 					$('#qxname3').text(json["rows"][2]["缺陷名称"]);
@@ -272,7 +274,7 @@
 					$('#qxl3').text(json["rows"][2]["缺陷率"]);
 					$('#qxl4').text(json["rows"][3]["缺陷率"]);
 					$('#qxl5').text(json["rows"][0]["其他缺陷率"]);
-
+                    }
 				}
 			});
 		}
@@ -321,7 +323,7 @@
 			}
 
 			Chart.defaults.global.defaultFontColor = 'white';
-			Chart.defaults.global.defaultFontSize = 18;
+			Chart.defaults.global.defaultFontSize = 17;
 			Chart.defaults.global.legend.display = false;
 
 			//每小时产量=========================================
@@ -341,7 +343,7 @@
 						fill: false,
 						backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
 						borderColor: window.chartColors.blue,
-						borderWidth: 2,
+                        borderWidth: 2,
 						pointRadius: 15,
 						data: []
 					}]
@@ -354,7 +356,7 @@
 					},
 					title: {
 						display: false,
-						text: '每小时产量'
+						text: ''
 					},
 					tooltips: {
 						mode: 'index',

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.ashx

@@ -122,28 +122,6 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-        	if (context.Request["m"].ToString() == "WorkshopSection")
-			{
-				string sqlStr = @"
-                SELECT
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='A'THEN 1 ELSE 0 END  ) 成型A交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='B'THEN 1 ELSE 0 END  ) 成型B交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=0 	 AND  gdd.DELIVERFLAG = '1' AND SUBSTR(GDD.GROUTINGLINECODE, 2,1)='C'THEN 1 ELSE 0 END  ) 成型C交坯数量,
-                        SUM(CASE WHEN TRUNC(  GDD.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量,
-                        SUM(CASE WHEN TRUNC(  GDD.delivertime) = trunc(sysdate)  AND gd.HIGHPRESSUREFLAG=1 	 AND  gdd.DELIVERFLAG = '1' THEN 1 ELSE 0 END  ) 高压交坯数量
-                        FROM TP_PM_GROUTINGDAILYDETAIL GDD
-                        LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDD.GROUTINGLINEID
-                        WHERE gdd.VALUEFLAG=1 and gd.VALUEFLAG=1
-                        AND gdd.GROUTINGFLAG=1 ";
-                //直接获取不分页数据
-                DataTable dt = conn.ExecuteDatatable(sqlStr);
-                string jsonStr = new JsonResult(dt).ToJson();
-                context.Response.Write(jsonStr);
-			}
-            
 				if (context.Request["m"].ToString() == "MonthSum")
 							{
 								string sqlStr = @"
@@ -352,7 +330,7 @@ SELECT
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -383,7 +361,7 @@ SELECT
 												),
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -408,7 +386,7 @@ SELECT
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+													pd.GROUTINGLINECODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.html

@@ -40,13 +40,13 @@
                         <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">人工：<span id="ydm">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 40px; text-align: left ">人工：<span id="ydm"  style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">机械手：<span id="ycx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 40px; text-align: left ">机械手：<span id="ycx"  style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">合计：<span id="ygx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 40px; text-align: left ">合计：<span id="ygx"   style="color:white;">测试数据</span></td>
                     </tr>
                 </table>
             </div>
@@ -55,7 +55,7 @@
                 <div style="width: 100%; height: 530px; ">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:50%;">
                         <tr class="tr_title_warning">
-                            <td colspan="7"style="font-size:30px">施釉工序个人数据</td>
+                            <td colspan="7"style="color: white; font-size: 30px">施釉工序个人数据</td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 30px; font-size:27px">
                             <td style="width: 15%;">工号</td>
@@ -70,12 +70,12 @@
                         <table style="width: 50%; display:none;" id="StaffTable_template">
                             <!--style=""-->
                             <tr class="tr_title_warning" style="height: 30px; font-size: 20px">
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号2}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量2}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; text-align: left ">{工号}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; ">{数量}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; text-align: left ">{工号1}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; ">{数量1}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; text-align: left ">{工号2}</td>
+                                <td style="font-size: 17px; color: white; height: 30px; width: 16%; ">{数量2}</td>
                             </tr>
                         </table>
                         <table id="StaffTable" style="width: 50%;">
@@ -84,8 +84,8 @@
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 50%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size: 30px">
-                            <td colspan="3" id="syqx">施釉缺陷率：——%</td>
-                            <td colspan="3" id="yscl">一烧产量：——</td>
+                            <td colspan="3" >施釉缺陷率：<span id="syqx" style="color: white; font-size: 30px; ">--</span></td>
+                            <td colspan="3" >一烧产量：<span id="yscl" style="color: white; font-size: 30px; ">--</span></td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 50px; font-size: 25px">
                             <td>缺陷</td>
@@ -157,7 +157,8 @@
         //页面加载
         $(document).ready(function () {
             timeUp();
-			initData();
+            initData();
+            StaffTableScroll();
 			doGetData = setInterval(function () { loadServerTime(); }, 3000);
            doGetData = setInterval(function () { timeUp(); }, 1000);
            loadDayTable();
@@ -165,7 +166,6 @@
 
         function timeUp() {
 			loadData();
-			StaffTable();
 			DefectDetails();
 			Alltotal();
 			MonthSum();
@@ -190,17 +190,35 @@
 				}
 			});
 		}
-		function StaffTableScroll() {
-			var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
-			$("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
-				function () {
-					$(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-					if (--StaffTableRowCount > -1) {
-					} else {
-						StaffTable();
-					}
-				}
-			);
+        function StaffTableScroll() {
+            var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
+            $("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--StaffTableRowCount > -1) {
+                    } else {
+                        clearInterval(StaffInterval);
+                        StaffTable();
+                    }
+                }
+            );
+        }
+
+        //表格滚动
+        function dayTableScroll() {
+            var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
+            $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (dayTableRowCount > -1) {
+                        dayTableRowCount--;
+                        console.log(dayTableRowCount);
+                    } else {
+                        clearInterval(dayInterval);
+                        loadDayTable();
+                    }
+                }
+            );
         }
 		function StaffTable() {
 			clearInterval(StaffInterval);
@@ -224,21 +242,6 @@
 				}
 			});
 		}
-        //表格滚动
-        function dayTableScroll() {
-			var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
-            $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
-                function () {
-                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-                    if (dayTableRowCount > -1) {
-                        dayTableRowCount--;
-						console.log(dayTableRowCount);
-                    } else {
-                        loadDayTable();
-                    }
-                }
-            );
-        }
         //明细表
 		function loadDayTable() {
 			$.get("GlazedKanban.ashx?m=MonthTable", function (data) {
@@ -279,7 +282,9 @@
 		function DefectDetails() {
 			$.get('GlazedKanban.ashx?m=DefectDetail', function (data) {
 				var json = JSON.parse(data);
-				if (json["success"] == true) {
+                if (json["success"] == true) {
+                    if (json["rows"].length > 0) {
+                   
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
 					$('#qxname2').text(json["rows"][1]["缺陷名称"]);
 					$('#qxname3').text(json["rows"][2]["缺陷名称"]);
@@ -297,7 +302,7 @@
 					$('#qxl3').text(json["rows"][2]["缺陷率"]);
 					$('#qxl4').text(json["rows"][3]["缺陷率"]);
 					$('#qxl5').text(json["rows"][0]["其他缺陷率"]);
-
+                    }
 				}
 			});
 		}

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.ashx

@@ -38,7 +38,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -350,7 +350,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -383,7 +383,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+													pd.GROUTINGLINECODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.html

@@ -40,23 +40,23 @@
                         <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 30px; text-align: left "class="td, th">月入库量：<span id="yrk">测试数据</span></td>
+                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">月入库量：<span id="yrk" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 30px; text-align: left "class="td, th">月出库量：<span id="yck">测试数据</span></td>
+                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">月出库量：<span id="yck" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 30px; text-align: left "class="td, th">精坯库存：<span id="kc">测试数据</span></td>
+                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">精坯库存：<span id="kc" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 70px; font-size: 30px; text-align: left "class="td, th">月检验量：<span id="yjyl">测试数据</span></td>
+                        <td style="width: 8%; height: 70px; font-size: 35px; text-align: left ">月检验量：<span id="yjyl" style="color:white;">测试数据</span></td>
                     </tr>
                 </table>
             </div>
             <!--表格-->
             <div style="width: 100%; height: 530px; display: flex; flex-direction: row; margin-top: 4%">
                 <div style="width: 50%; height: 530px; padding-right: 20px;">
-                    <table cellspacing="0" cellpadding="0" border="0" style="width: 53%; ">
+                    <table cellspacing="0" cellpadding="0" border="0" style="width: 65%; ">
                         <tr class="tr_title_warning">
                             <td colspan="4" style="color:white;">半检工个人检验数据</td>
                         </tr>
@@ -67,29 +67,29 @@
                             <td>数量</td>
                         </tr>
                     </table>
-                    <div style="width: 53%; height: 124px; overflow: hidden; ">
+                    <div style="width: 65%; height: 174px; overflow: hidden; ">
                         <table cellspacing="0" cellpadding="0" border="0" style="width: 53%; display: none; " id="StaffTable_template">
                             <tr class="tr_bg_light_warning" style="height: 30px; font-size:17px">
-                                <td style="font-size: 13px; width: 25%; height: 30px; text-align: left">{工号}</td>
-                                <td style="font-size: 13px; width: 25%; height: 30px; ">{数量}</td>
-                                <td style="font-size: 13px; width: 25%; height: 30px; text-align: left ">{工号2}</td>
-                                <td style="font-size: 13px; width: 25%; height: 30px; ">{数量2}</td>
+                                <td style="font-size: 15px; width: 25%; height: 30px; color: white; text-align: left">{工号}</td>
+                                <td style="font-size: 15px; width: 25%; color: white; height: 30px; ">{数量}</td>
+                                <td style="font-size: 15px; width: 25%; color: white; height: 30px; text-align: left ">{工号2}</td>
+                                <td style="font-size: 15px; width: 25%; color: white; height: 30px; ">{数量2}</td>
                             </tr>
                         </table>
                         <table id="StaffTable" style="width: 100%; ">
                         </table>
                     </div>
-                    <div style="width:80%;height:230px;display:flex;flex-direction:row;margin-left:40%;margin-top:-230px">
-                        <div style="width: 100%; height: 530px;">
-                            <div style="color:white;font-size:30px;font-weight:600; text-align:center">半检缺陷（TOP3）</div>
+                    <div style="width:80%;height:230px;display:flex;flex-direction:row;margin-left:42%;margin-top:-278px">
+                        <div style="width: 100%; height: 520px;">
+                            <div style="color:white;font-size:30px;font-weight:600; text-align:center">半检质量</div>
                             <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                         </div>
                     </div>
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 100%; margin-top: 5%;">
                         <tr class="tr_title_warning" style="height: 60px;">
-                            <td colspan="3"  class="tr_title_warning"  id="bjqxl">半检缺陷率：--</td>
-                            <td colspan="3"  class="tr_title_warning"   id="scl">一烧产量：--</td>
+                            <td colspan="3"  class="tr_title_warning"  style="font-size:30px;">半检缺陷率：<span id="bjqxl"  style="color: white; font-size: 30px; ">--</span></td>
+                            <td colspan="3"  class="tr_title_warning"   style="font-size: 30px;">一烧产量：<span  id="scl"  style="color: white; font-size: 30px; ">--</span></td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 60px; font-size: 25px">
                             <td>缺陷</td>
@@ -185,31 +185,36 @@
 				}
 			});
 		}
+        function StaffTableScroll() {
+            var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
+            $("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--StaffTableRowCount > -1) {
+                    } else {
+                        clearInterval(StaffInterval);
+                        StaffTable();
+                    }
+                }
+            );
+        }
+
         //表格滚动
         function dayTableScroll() {
-			var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
+            var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
             $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
                 function () {
                     $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-                    if (--dayTableRowCount > -1) {
+                    if (dayTableRowCount > -1) {
+                        dayTableRowCount--;
+                        console.log(dayTableRowCount);
                     } else {
+                        clearInterval(dayInterval);
                         loadDayTable();
                     }
                 }
             );
         }
-		function StaffTableScroll() {
-			 var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
-			    $("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
-				function () {
-					$(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-					if (--StaffTableRowCount > -1) {
-					} else {
-						StaffTable();
-					}
-				}
-			);
-        }
 		function MonthSum() {
 			$.get('HalfCheckKanban.ashx?m=MonthSum', function (data) {
 				var json = JSON.parse(data);
@@ -314,8 +319,8 @@
 			$.get('HalfCheckKanban.ashx?m=Alltotal', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-					$('#bjqxl').text("半检缺陷率："+json["rows"][0]["缺陷率"]);
-					$('#scl').text("一烧出窑数："+json["rows"][0]["出窑数"]);
+					$('#bjqxl').text(json["rows"][0]["缺陷率"]);
+					$('#scl').text(json["rows"][0]["出窑数"]);
 				}
 			});
 		}

wwwroot/main/Procedure/PackagingKanban/PackagingKanban.html

@@ -45,136 +45,127 @@
                 <div style="width: 50%;height:530px;padding-right:20px;">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
                         <tr class="tr_title_warning">
-                            <td colspan="9" style="color:white;">每日型号达成情况</td>
+                            <td colspan="9" style="color:white;">包装数量:----</td>
                         </tr>
                         <tr class="tr_title_warning">
                             <td>产品型号</td>
-                            <td>计划数量</td>
-                            <td>达成数量</td>
-                            <td>达成率</td>
+                            <td>产品名称</td>
+                            <td>包装数量</td>
                         </tr>
 
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+ 
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
                         </tr>
                     </table>
                 </div>
                 <div style="width: 50%;height:530px;padding-right:20px;">
                     <table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
                         <tr class="tr_title_warning">
-                            <td colspan="9" style="color:white;">每月型号达成情况</td>
+                            <td colspan="9" style="color:white;">包装工个人数据</td>
                         </tr>
                         <tr class="tr_title_warning">
-                            <td>产品型号</td>
-                            <td>计划数量</td>
-                            <td>达成数量</td>
-                            <td>达成率</td>
+                            <td>包装工</td>
+                            <td>产品编码</td>
+                            <td>产品名称</td>
+                            <td>包装数量</td>
                         </tr>
 
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height:30px;">
-                            <td style="font-size: 18px; width: 11%">H0966L-W</td>
-                            <td style="font-size: 18px; width: 11%">1314</td>
-                            <td style="font-size: 18px; width: 11%">1169</td>
-                            <td style="font-size: 18px; width: 11%">80%</td>
+                            <td style="font-size: 18px; width: 11%">测试员工</td>
+                            <td style="font-size: 18px; width: 11%">测试编码</td>
+                            <td style="font-size: 18px; width: 11%">测试名称</td>
+                            <td style="font-size: 18px; width: 11%">200</td>
                         </tr>
                     </table>
                 </div>

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.ashx

@@ -204,7 +204,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 																				WHERE 打磨 is not null	 
 							
 							
-																				union to
+																				union all
 											 
 													SELECT
 													*
@@ -400,7 +400,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -439,7 +439,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -466,7 +466,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+													pd.GROUTINGLINECODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.html

@@ -40,13 +40,13 @@
                         <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2" ><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月打磨：<span id="ydm">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">月打磨：<span id="ydm" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月擦洗：<span id="ycx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">月擦洗：<span id="ycx" style="color:white;">测试数据</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月改洗：<span id="ygx">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">月改洗：<span id="ygx" style="color:white;">测试数据</span></td>
                     </tr>
                 </table>
             </div>
@@ -66,12 +66,12 @@
                     <div style=" height:170px;overflow:hidden;">
                         <table style="width: 50%; display:none;" id="StaffTable_template"> <!--style=""-->
                             <tr class="tr_title_warning" style="height: 30px; font-size: 20px">
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量1}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; text-align: left ">{工号2}</td>
-                                <td style="font-size: 15px; height: 30px; width: 16%; ">{数量2}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号1}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量1}</td>
+                                <td style="font-size: 18px; color: white; height: 30px; width: 16%; text-align: left ">{工号2}</td>
+                                <td style="font-size: 20px; color: white; height: 30px; width: 16%; ">{数量2}</td>
                             </tr>
                         </table>
                         <table id="StaffTable" style="width: 50%;">
@@ -80,11 +80,11 @@
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 50%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size: 30px">
-                            <td colspan="6" id="scl">一烧产量：——</td>
+                            <td colspan="6">一烧产量<span id="scl" style="color:white;">：——</span></td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 50px; font-size: 30px">
-                            <td colspan="3" id="dmqxl">打磨缺陷率：——</td>
-                            <td colspan="3"  id="cxqxl">擦洗缺陷率：——</td>
+                            <td colspan="3">打磨缺陷率：<span id="dmqxl" style="color:white;">——</span></td>
+                            <td colspan="3">擦洗缺陷率：<span id="cxqxl" style="color:white;">——</span></td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 50px; font-size: 25px">
                             <td>缺陷</td>
@@ -155,17 +155,18 @@
 
         //页面加载  
         $(document).ready(function () {
+            loadData();
+            initData();
+            clearData();
             timeUp();
+            StaffTableScroll();
+            dayTableScroll();
 			doGetData = setInterval(function () { loadServerTime(); }, 3000);
-           doGetData = setInterval(function () { timeUp(); }, 10000);
-           loadDayTable();
+           doGetData = setInterval(function () { timeUp(); }, 1000);
         });
 
         function timeUp() {
-			loadData();
-			initData();
-			clearData();
-			StaffTable();
+            loadData();
 			DefectDetails();
 			Alltotal();
 			MonthSum();
@@ -174,9 +175,9 @@
 			$.get('RefinementKanban.ashx?m=Alltotal', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-                    $('#scl').text("一烧出窑数：" + json["rows"][0]["出窑数"]);
-					$('#dmqxl').text("一烧出窑数：" + json["rows"][0]["打磨缺陷率"]);
-					$('#cxqxl').text("一烧出窑数：" + json["rows"][0]["擦洗缺陷率"]);
+                    $('#scl').text( json["rows"][0]["出窑数"]);
+					$('#dmqxl').text(json["rows"][0]["打磨缺陷率"]);
+					$('#cxqxl').text(json["rows"][0]["擦洗缺陷率"]);
 				}
 			});
         }
@@ -191,17 +192,35 @@
 				}
 			});
 		}
-		function StaffTableScroll() {
-			var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
-			$("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
-				function () {
-					$(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-					if (--StaffTableRowCount > -1) {
-					} else {
-						StaffTable();
-					}
-				}
-			);
+        function StaffTableScroll() {
+            var scrollHeight = $("#StaffTable_template").find("tr").outerHeight();
+            $("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--StaffTableRowCount > -1) {
+                    } else {
+                        clearInterval(StaffInterval);
+                        StaffTable();
+                    }
+                }
+            );
+        }
+
+        //表格滚动
+        function dayTableScroll() {
+            var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
+            $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (dayTableRowCount > -1) {
+                        dayTableRowCount--;
+                        console.log(dayTableRowCount);
+                    } else {
+                        clearInterval(dayInterval);
+                        loadDayTable();
+                    }
+                }
+            );
         }
 		function StaffTable() {
 			clearInterval(StaffInterval);
@@ -221,25 +240,11 @@
 						$("#StaffTable").append(temp);
 					}
 					StaffTableRowCount = json["rows"].length;
-					StaffInterval = setInterval(StaffTableScroll, 3000);
+					StaffInterval = setInterval(StaffTableScroll, 2000);
 				}
 			});
 		}
-        //表格滚动
-        function dayTableScroll() {
-			var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
-            $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
-                function () {
-                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
-                    if (dayTableRowCount > -1) {
-                        dayTableRowCount--;
-						console.log(dayTableRowCount);
-                    } else {
-                        loadDayTable();
-                    }
-                }
-            );
-        }
+     
         //明细表
 		function loadDayTable() {
 			$.get("RefinementKanban.ashx?m=MonthTable", function (data) {
@@ -256,7 +261,7 @@
 						$("#dayTable").append(temp);
                     }
 					dayTableRowCount = json["rows"].length;
-					dayInterval = setInterval(dayTableScroll, 6000);
+                    dayInterval = setInterval(dayTableScroll, 2000);
 				}
 			});
         }