看板调整

wwwroot/main/DashBoard/api/GetDashBoard.ashx

@@ -19,8 +19,11 @@ public class GetDashBoard : IHttpHandler,IRequiresSessionState
         JArray array = new JArray();
 
         array.Add(new JObject(new JProperty("name", "【正式】成型看板"),new JProperty("url", "/main/Procedure/FormingKanban/FormingKanban.html")));
-         array.Add(new JObject(new JProperty("name", "【正式】精修看板"),new JProperty("url", "/main/Procedure/RefinementKanban/RefinementKanban.html")));
-          array.Add(new JObject(new JProperty("name", "【正式】半检看板"),new JProperty("url", "/main/Procedure/HalfCheckKanban/HalfCheckKanban.html")));
+        array.Add(new JObject(new JProperty("name", "【正式】精修看板"),new JProperty("url", "/main/Procedure/RefinementKanban/RefinementKanban.html")));
+        array.Add(new JObject(new JProperty("name", "【正式】半检看板"),new JProperty("url", "/main/Procedure/HalfCheckKanban/HalfCheckKanban.html")));
+        array.Add(new JObject(new JProperty("name", "【测试】施釉看板"),new JProperty("url", "/main/Procedure/GlazedKanban/GlazedKanban.html")));
+        array.Add(new JObject(new JProperty("name", "【测试】烧成看板"),new JProperty("url", "/main/Procedure/BurnIntoKanban/BurnIntoKanban.html")));
+        array.Add(new JObject(new JProperty("name", "【测试】成检看板"),new JProperty("url", "/main/Procedure/Boardkanban/Boardkanban.html")));
 
         context.Response.Write(array.ToString());
     }

wwwroot/main/Procedure/Boardkanban/Boardkanban.ashx

@@ -3,10 +3,8 @@
 using System;
 using System.Web;
 using System.Web.SessionState;
-using System.Configuration;
 using System.Data;
 using Curtain.DataAccess;
-using Curtain.Log;
 using DK.XuWei.WebMes;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
@@ -117,192 +115,30 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
-            }
+            }	
+			if (context.Request["m"].ToString() == "MonthSum")
+				{
+				string sqlStr = @"
+								WITH  一烧出窑量 as (SELECT  COUNT(*) AS 一烧出窑量 FROM TP_PM_PRODUCTIONDATA 
+													WHERE PROCEDUREID IN(56,14) AND VALUEFLAG=1
+													),
+													一烧产量 as (
 
-            
-				if (context.Request["m"].ToString() == "MonthSum")
-							{
-								string sqlStr = @"
-								SELECT
-													*
-													FROM(
-													select 
-													 CASE WHEN gid=3 THEN pdg.A313 +pdg.A21  end 打磨
-													 from ( select  grouping_id(pdata.productionlineid,pdata.goodstypename2,pdata.goodscode) gid,       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
-														   pd.productionlineid,
-														   gt2.goodstypename goodstypename2,
-														   gt.goodstypename,
-														   g.goodscode,
-														   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
-													  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 
-														   pd.productionlineid,
-														   gt2.goodstypename,
-														   gt.goodstypename,
-														   g.goodscode,
-														   g.goodsspecification,
-														   g.GOODSMODEL,
-														   dd.dictionaryvalue
-													 order by gt2.goodstypename, g.goodscode ) pdata
-													 group by grouping sets((pdata.productionlineid,
-																			 pdata.goodstypename2,
-																			 pdata.goodstypename,
-																			 pdata.goodsspecification,
-																			 pdata.GOODSMODEL,
-																			 pdata.GLAZETYPE,
-																			 pdata.goodscode),
-																			 (pdata.productionlineid,pdata.goodstypename2),
-																			 pdata.productionlineid)
-													 ) pdg
-																				)
-																				WHERE 打磨 is not null	 
-							
-							
-																				union all
-											 
-													SELECT
-													*
-													FROM(
-													select 
-													 CASE WHEN gid=3 THEN pdg.A313 +pdg.A21  end 打磨
-													 from ( select  grouping_id(pdata.productionlineid,pdata.goodstypename2,pdata.goodscode) gid,       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
-														   pd.productionlineid,
-														   gt2.goodstypename goodstypename2,
-														   gt.goodstypename,
-														   g.goodscode,
-														   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
-													  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 
-														   pd.productionlineid,
-														   gt2.goodstypename,
-														   gt.goodstypename,
-														   g.goodscode,
-														   g.goodsspecification,
-														   g.GOODSMODEL,
-														   dd.dictionaryvalue
-													 order by gt2.goodstypename, g.goodscode ) pdata
-													 group by grouping sets((pdata.productionlineid,
-																			 pdata.goodstypename2,
-																			 pdata.goodstypename,
-																			 pdata.goodsspecification,
-																			 pdata.GOODSMODEL,
-																			 pdata.GLAZETYPE,
-																			 pdata.goodscode),
-																			 (pdata.productionlineid,pdata.goodstypename2),
-																			 pdata.productionlineid)
-													 ) pdg
-																				)
-																				WHERE 打磨 is not null	 
-							
-																				UNION ALL
-													SELECT
-													*
-													FROM(
-													select 
-													 CASE WHEN gid=3 THEN pdg.A313 +pdg.A21  end 打磨
-													 from ( select  grouping_id(pdata.productionlineid,pdata.goodstypename2,pdata.goodscode) gid,       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
-														   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 
-														   pd.productionlineid,
-														   gt2.goodstypename,
-														   gt.goodstypename,
-														   g.goodscode,
-														   g.goodsspecification,
-														   g.GOODSMODEL,
-														   dd.dictionaryvalue
-													 order by gt2.goodstypename, g.goodscode ) pdata
-													 group by grouping sets((pdata.productionlineid,
-																			 pdata.goodstypename2,
-																			 pdata.goodstypename,
-																			 pdata.goodsspecification,
-																			 pdata.GOODSMODEL,
-																			 pdata.GLAZETYPE,
-																			 pdata.goodscode),
-																			 (pdata.productionlineid,pdata.goodstypename2),
-																			 pdata.productionlineid)
-													 ) pdg
-																				)
-																				WHERE 打磨 is not null	 ";
+													SELECT  COUNT(*) 一烧产量 FROM TP_PM_PRODUCTIONDATA 
+													WHERE PROCEDUREID IN(15,16) AND VALUEFLAG=1
+													AND GOODSLEVELID=4
+													),
+													综合产量 as (
+													SELECT COUNT(*)综合数量 FROM TP_PM_PRODUCTIONDATA
+													WHERE PROCEDUREID IN(15,16,27,28) AND VALUEFLAG=1
+													)
+													SELECT 
+													一烧出窑量.一烧出窑量,
+													一烧产量.一烧产量,
+													综合产量.综合数量
+													FROM 一烧出窑量
+													LEFT JOIN 一烧产量 on 1=1
+													LEFT JOIN 综合产量 on 1=1	";
 								//直接获取不分页数据
 								DataTable dt = conn.ExecuteDatatable(sqlStr);
 								string jsonStr = new JsonResult(dt).ToJson();
@@ -418,7 +254,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -445,7 +281,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													PD.GROUTINGLINECODE 生产线号,
+													pd.GOODSCODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -460,9 +296,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														--INNER JOIN TP_PM_PRODUCTIONDATA PDD ON PD.BARCODE = PDD.BARCODE
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
-														AND TMDP.VALUEFLAG = '1' --有效 
-														
-											)";
+														AND TMDP.VALUEFLAG = '1' --有效  )";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -535,11 +369,8 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													 ) pdg
 													 							GROUP BY pdg.SJ
 																				ORDER BY pdg.SJ
-														)
-							
-																				
-),
-擦洗 AS (SELECT
+														) ),
+									擦洗 AS (SELECT
 													*
 													FROM(
 													select 

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"  style="color:white;">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧产量：<span id="ysc"  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"  style="color:white;">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">综合产量：<span id="zhc"  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"   style="color:white;">测试数据</span></td>
+                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">一烧出窑量：<span id="yscy"  style="color:white;">加载中...</span></td>
                     </tr>
                 </table>
             </div>
@@ -122,7 +122,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 18px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 18px; width: 25%; height: 30px; ">生产线号</td>
+                        <td style="font-size: 18px; width: 25%; height: 30px; ">产品编码</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">缺陷位置</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>
@@ -184,9 +184,9 @@
 			$.get('Boardkanban.ashx?m=MonthSum', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-                    $('#ydm').text( json["rows"][0]["打磨"]);
-					$('#ycx').text(json["rows"][1]["打磨"]);
-					$('#ygx').text(json["rows"][2]["打磨"]);
+                    $('#ysc').text(json["rows"][0]["一烧产量"]);
+                    $('#zhc').text(json["rows"][0]["综合数量"]);
+                    $('#yscy').text(json["rows"][0]["一烧出窑量"]);
 
 				}
 			});
@@ -204,7 +204,6 @@
 				}
 			);
         }
-	
         //表格滚动
         function dayTableScroll() {
 			var scrollHeight = $("#dayTable_template").find("tr").outerHeight();
@@ -221,7 +220,6 @@
                 }
             );
         }
-
         function StaffTable() {
             clearInterval(StaffInterval);
             $.get("Boardkanban.ashx?m=StaffTable", function (data) {

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.ashx

@@ -10,25 +10,25 @@ using Curtain.Log;
 using DK.XuWei.WebMes;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
-public class  FormingKanban : IHttpHandler, IReadOnlySessionState
+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() == "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() == "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() == "StaffTable")
+            if (context.Request["m"].ToString() == "StaffTable")
             {
                 string sqlStr = @"SELECT
 									UU.STAFFCODE,
@@ -119,11 +119,11 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-       
-            
-				if (context.Request["m"].ToString() == "MonthSum")
-							{
-								string sqlStr = @"
+
+
+            if (context.Request["m"].ToString() == "MonthSum")
+            {
+                string sqlStr = @"
 								SELECT
 													*
 													FROM(
@@ -304,15 +304,15 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													 ) pdg
 																				)
 																				WHERE 打磨 is not null	 ";
-								//直接获取不分页数据
-								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
 												缺陷名称,
 													缺陷数量
@@ -378,7 +378,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -395,9 +395,9 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
-			}
+            }
 
-			    if (context.Request["m"].ToString() == "Alltotal")
+            if (context.Request["m"].ToString() == "Alltotal")
             {
                 string sqlStr = @"with 打磨 AS (
 											SELECT
@@ -410,7 +410,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -424,9 +424,9 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-                 	if (context.Request["m"].ToString() == "MonthTable")
-			{
-				string sqlStr = @"SELECT
+            if (context.Request["m"].ToString() == "MonthTable")
+            {
+                string sqlStr = @"SELECT
 										责任工号,
 										生产线号,
 										缺陷名称,
@@ -435,7 +435,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													TMDP.PRODUCTIONLINECODE 生产线号,
+														pd.GOODSCODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -458,11 +458,11 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 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(
+            if (context.Request["m"].ToString() == "rate")//折线图
+            {
+                string sqlStr = @"WITH 入库 AS(
 								SELECT
 													*
 													FROM(
@@ -608,7 +608,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
-			}
+            }
         }
     }
 

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.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</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 35px; text-align: left ">装窑：<span id="ydm" style="color:white;">测试数据</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: 35px; text-align: left ">白坯入库：<span id="ycx" style="color:white;">测试数据</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: 35px; text-align: left ">白坏库存：<span id="ygx" style="color:white;">测试数据</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>
@@ -121,7 +121,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 18px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 18px; width: 25%; height: 30px; ">生产线号</td>
+                        <td style="font-size: 18px; width: 25%; height: 30px; ">产品编码</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">缺陷位置</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>

wwwroot/main/Procedure/FormingKanban/FormingKanban.ashx

@@ -30,19 +30,24 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 			{
 				string sqlStr = @"
                  SELECT
-                        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(  GDS.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDS.GROUTINGLINECODE, 2,1)='A' THEN 1 ELSE 0 END  ) 成型A注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDS.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDS.GROUTINGLINECODE, 2,1)='B' THEN 1 ELSE 0 END  ) 成型B注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDS.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=0   AND SUBSTR(GDS.GROUTINGLINECODE, 2,1)='C' THEN 1 ELSE 0 END  ) 成型C注浆数量,
+                        SUM(CASE WHEN TRUNC(  GDS.GROUTINGDATE) = trunc(sysdate) AND gd.HIGHPRESSUREFLAG=1   THEN 1 ELSE 0 END  ) 高压注浆数量
+                        FROM TP_PM_GROUTINGDAILYDETAIL GDS
+												LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDS.GROUTINGLINEID
+                        WHERE GDS.VALUEFLAG=1 and gd.VALUEFLAG=1 
+												
+												UNION ALL
+												
+												SELECT
                         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
-
- ";
+												FROM TP_PM_PRODUCTIONDATA GDD
+												LEFT JOIN TP_PC_GROUTINGLINE GD ON GD.GROUTINGLINEID=GDD.GROUTINGLINEID
+                        WHERE gdd.VALUEFLAG=1 and gd.VALUEFLAG=1";
 				//直接获取不分页数据
 				DataTable dt = conn.ExecuteDatatable(sqlStr);
 				string jsonStr = new JsonResult(dt).ToJson();
@@ -313,7 +318,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														ROWNUM <= 4 
 													) 
 												),
-												检验数 AS ( SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1  ) SELECT
+												检验数 AS ( SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1  ) SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
 												其他缺陷.其他缺陷数量,

wwwroot/main/Procedure/FormingKanban/FormingKanban.html

@@ -40,10 +40,10 @@
                         <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: 12%; height: 140px; font-size: 35px; text-align: left ">月交坯量：<span style="text-align: center; color: white; font-size: 50px; " id="yjp">测试数据</span></td>
+                        <td style="width: 12%; height: 140px; font-size: 30px; 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: 12%; height: 140px; font-size: 35px; text-align: left ">月注浆量：<span style="text-align: center; color: white; font-size: 50px; " id="yzj">测试数据</span></td>
+                        <td style="width: 12%; height: 140px; font-size: 30px; text-align: left ">月注浆量：<span style="text-align: center; color: white; font-size: 50px; " id="yzj">加载中...</span></td>
                     </tr>
                 </table>
             </div>
@@ -242,13 +242,13 @@
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#cxaz').text("注浆量：" + json["rows"][0]["成型A注浆数量"]);
-					$('#cxaj').text("交坯量：" + json["rows"][0]["成型A交坯数量"]);
-					$('#cxbz').text("注浆量：" + json["rows"][0]["成型B注浆数量"]);
-					$('#cxbj').text("交坯量：" + json["rows"][0]["成型B交坯数量"]);
-					$('#cxcz').text("注浆量：" + json["rows"][0]["成型C注浆数量"]);
-					$('#cxcj').text("交坯量：" + json["rows"][0]["成型C交坯数量"]);
+                    $('#cxaj').text("交坯量：" + json["rows"][1]["成型A注浆数量"]);
+                    $('#cxbz').text("注浆量：" + json["rows"][0]["成型B注浆数量"]);
+                    $('#cxbj').text("交坯量：" + json["rows"][1]["成型B注浆数量"]);
+                    $('#cxcz').text("注浆量：" + json["rows"][0]["成型C注浆数量"]);
+                    $('#cxcj').text("交坯量：" + json["rows"][1]["成型C注浆数量"]);
 					$('#gyz').text("注浆量：" + json["rows"][0]["高压注浆数量"]);
-					$('#gyj').text("交坯量：" + json["rows"][0]["高压交坯数量"]);
+                    $('#gyj').text("交坯量：" + json["rows"][1]["高压注浆数量"]);
 				}
 			});
         }

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.ashx

@@ -276,7 +276,6 @@ SELECT
 													WHERE
 														dfc.DEFECTPROCEDUREID IN(10,37,41)
 														AND dfc.VALUEFLAG = 1 
-															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate)  
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -297,7 +296,6 @@ SELECT
 														TP_PM_DEFECT dfc
 													WHERE
 													dfc.PROCEDUREID IN (6,15,16)
-													AND TRUNC( dfc.CREATETIME ) = trunc(sysdate)  
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -316,7 +314,6 @@ SELECT
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
 															dfc.DEFECTPROCEDUREID IN(10,37,41)
-																AND TRUNC( dfc.CREATETIME ) = trunc(sysdate)  
 														AND dfc.VALUEFLAG = 1 
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -330,7 +327,7 @@ SELECT
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -361,7 +358,7 @@ SELECT
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -386,7 +383,7 @@ SELECT
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													pd.GROUTINGLINECODE 生产线号,
+														pd.GOODSCODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -403,7 +400,6 @@ SELECT
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN(10,37,41)
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
 														)
 														";
                 //直接获取不分页数据

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: 40px; text-align: left ">人工：<span id="ydm"  style="color:white;">测试数据</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: 40px; text-align: left ">机械手：<span id="ycx"  style="color:white;">测试数据</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: 40px; text-align: left ">合计：<span id="ygx"   style="color:white;">测试数据</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>
@@ -121,7 +121,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 18px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 18px; width: 25%; height: 30px; ">生产线号</td>
+                        <td style="font-size: 18px; width: 25%; height: 30px; ">产品编码</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">缺陷位置</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.ashx

@@ -38,7 +38,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -372,9 +372,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 
             if (context.Request["m"].ToString() == "MonthTable")
             {
-                string sqlStr = @"
-
-									SELECT
+                string sqlStr = @"SELECT
 										责任工号,
 										生产线号,
 										缺陷名称,
@@ -383,7 +381,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													pd.GROUTINGLINECODE 生产线号,
+													pd.GOODSCODE 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
@@ -400,6 +398,9 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
+														AND tmdp.DEFECTPROCEDUREID IN(1,2,3,4,5,36,53,54)
+														
+														
 											) ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.html

@@ -40,16 +40,16 @@
                         <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: 35px; text-align: left ">月入库量：<span id="yrk" style="color:white;">测试数据</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: 35px; text-align: left ">月出库量：<span id="yck" style="color:white;">测试数据</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: 35px; text-align: left ">精坯库存：<span id="kc" style="color:white;">测试数据</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: 35px; text-align: left ">月检验量：<span id="yjyl" style="color:white;">测试数据</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>
@@ -125,7 +125,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 18px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 18px; width: 25%; height: 30px; ">生产线号</td>
+                        <td style="font-size: 18px; width: 25%; height: 30px; ">产品编码</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">缺陷位置</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>
@@ -207,7 +207,6 @@
                     $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
                     if (dayTableRowCount > -1) {
                         dayTableRowCount--;
-                        console.log(dayTableRowCount);
                     } else {
                         clearInterval(dayInterval);
                         loadDayTable();

wwwroot/main/Procedure/PackagingKanban/PackagingKanban.html

@@ -36,7 +36,7 @@
                     </tr>
                     <tr class="tr_bg_dark_warning">
                        
-                        <td style="width: 8%; height: 330px; font-size: 35px; text-align: center " class="td, th" rowspan="4"><br /><br /><br />月包装量：<span id="yjyl">测试数据</span></td>
+                        <td style="width: 8%; height: 330px; font-size: 35px; text-align: center " class="td, th" rowspan="4"><br /><br /><br />月包装量：<span id="yjyl">加载中...</span></td>
                     </tr>
                 </table>
             </div>

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.ashx

@@ -400,7 +400,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and VALUEFLAG=1
 												) 
 	
 												SELECT
@@ -439,7 +439,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and GOODSLEVELID in (4) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -466,13 +466,14 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 											SELECT DISTINCT
 													stf.STAFFCODE 责任工号,
 													TMDP.BARCODE 条码,
-													pd.GROUTINGLINECODE 生产线号,
+													jo.JOBSNAME 生产线号,
 													TMDP.DEFECTNAME 缺陷名称,
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
 													LEFT JOIN TP_MST_DEFECT DF ON DF.DEFECTID=TMDP.DEFECTID
 														LEFT JOIN TP_MST_USERSTAFF class on class.USERID=tmdp.DEFECTUSERID
 														LEFT JOIN TP_HR_STAFF stf on stf.STAFFID=class.STAFFID
+														left JOIN TP_MST_JOBS jo on jo.JOBSID=tmdp.DEFECTJOBS
 														LEFT JOIN TP_PM_PRODUCTIONDATA PD ON TMDP.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
 														LEFT JOIN TP_MST_GOODSLEVEL TMG ON TMG.GOODSLEVELID = PD.GOODSLEVELID
 														--LEFT JOIN TP_PC_PROCEDURE TPP ON PD.PROCEDUREID = TPP.PROCEDUREID
@@ -483,7 +484,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN (4,5,53,54)
-														
+
 											)";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);

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: 35px; text-align: left ">月打磨：<span id="ydm" style="color:white;">测试数据</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: 35px; text-align: left ">月擦洗：<span id="ycx" style="color:white;">测试数据</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: 35px; text-align: left ">月改洗：<span id="ygx" style="color:white;">测试数据</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>
@@ -80,7 +80,7 @@
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 50%;">
                         <tr class="tr_title_warning" style="height: 60px; font-size: 30px">
-                            <td colspan="6">一烧产量<span id="scl" style="color:white;">：——</span></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">打磨缺陷率：<span id="dmqxl" style="color:white;">——</span></td>
@@ -120,7 +120,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 18px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 18px; width: 25%; height: 30px; ">生产线号</td>
+                        <td style="font-size: 18px; width: 25%; height: 30px; ">工种</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">缺陷位置</td>
                         <td style="font-size: 18px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>
@@ -129,7 +129,7 @@
                     <table id="dayTable_template" style="display:none;">
                         <tr class="tr_bg_light_warning" style="height:30px;">
                             <td style="font-size: 18px; width: 25%; height: 30px; ">{责任工号}</td>
-                            <td style="font-size: 18px; width: 25%; height: 30px; ">{生产线号}</td>
+                            <td style="font-size: 18px; width: 25%; height: 30px; ">{工种}</td>
                             <td style="font-size: 18px; width: 25%; height: 30px; ">{缺陷名称}</td>
                             <td style="font-size: 18px; width: 25%; height: 30px; ">{产品分级}</td>
                         </tr>
@@ -159,8 +159,8 @@
             initData();
             clearData();
             timeUp();
-            StaffTableScroll();
-            dayTableScroll();
+            StaffTable();
+            loadDayTable();
 			doGetData = setInterval(function () { loadServerTime(); }, 3000);
            doGetData = setInterval(function () { timeUp(); }, 1000);
         });
@@ -255,7 +255,7 @@
 						var temp = $("#dayTable_template").html();
 						temp = temp.replace("<tbody>", "").replace("</tbody>", "");
 						temp = temp.replace('{责任工号}', json["rows"][i]['责任工号']);
-						temp = temp.replace('{生产线号}', json["rows"][i]['生产线号']);
+                        temp = temp.replace('{工种}', json["rows"][i]['生产线号']);
 						temp = temp.replace('{缺陷名称}', json["rows"][i]['缺陷名称']);
                         temp = temp.replace('{产品分级}', json["rows"][i]['产品分级']);
 						$("#dayTable").append(temp);