晟昊看板大致取数 (未核对)

wwwroot/main/Procedure/Boardkanban/Boardkanban.ashx

@@ -26,6 +26,15 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 				context.Response.Write(json.ToString());
 			}
 
+						int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+							string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+							string second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+							if (day > 25)
+							{
+									first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+									second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+							}
+
 			if (context.Request["m"].ToString() == "StaffTable")
             {
                 string sqlStr = @"SELECT
@@ -63,7 +72,8 @@ 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 ( 16,47 ) 
+												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -83,7 +93,8 @@ 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 ( 16,47 ) 
+												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -103,7 +114,8 @@ 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 ( 16,47 ) 
+												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -120,17 +132,17 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 				{
 				string sqlStr = @"
 								WITH  一烧出窑量 as (SELECT  COUNT(*) AS 一烧出窑量 FROM TP_PM_PRODUCTIONDATA 
-													WHERE PROCEDUREID IN(56,14) AND VALUEFLAG=1
+													WHERE PROCEDUREID IN(56,14) AND VALUEFLAG=1 AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
 													),
 													一烧产量 as (
 
 													SELECT  COUNT(*) 一烧产量 FROM TP_PM_PRODUCTIONDATA 
-													WHERE PROCEDUREID IN(15,16) AND VALUEFLAG=1
+													WHERE PROCEDUREID IN(15,16) AND VALUEFLAG=1 AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
 													AND GOODSLEVELID=4
 													),
 													综合产量 as (
 													SELECT COUNT(*)综合数量 FROM TP_PM_PRODUCTIONDATA
-													WHERE PROCEDUREID IN(15,16,27,28) AND VALUEFLAG=1
+													WHERE PROCEDUREID IN(15,16,27,28) AND VALUEFLAG=1 AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
 													)
 													SELECT 
 													一烧出窑量.一烧出窑量,
@@ -160,9 +172,8 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
-														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
-														AND dfc.VALUEFLAG = 1 
+														dfc.VALUEFLAG = 1 
+														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -182,7 +193,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													FROM
 														TP_PM_DEFECT dfc
 													WHERE
-													dfc.PROCEDUREID=6
+												 TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -200,9 +211,8 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
-														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
-														AND dfc.VALUEFLAG = 1 
+														dfc.VALUEFLAG = 1 
+														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -215,7 +225,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14 
+												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID = 14  AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												) 
 	
 												SELECT
@@ -241,29 +251,19 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												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(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)
+												WHERE dfc.VALUEFLAG=1 AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+												
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)    and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												)
 												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();
@@ -296,7 +296,9 @@ 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' --有效  
+														AND TRUNC(TMDP.CREATETIME)=TRUNC(SYSDATE)
+														)";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -305,212 +307,76 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 
 		if (context.Request["m"].ToString() == "rate")//折线图
 			{
-				string sqlStr = @"WITH 打磨 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, 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
-														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
-														) ),
-									擦洗 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, 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
-														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
-														)
-						
-							),
-							改洗 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";
+				string sqlStr = @"	with	缺陷 AS 
+												(
+												SELECT
+												SJ,
+												SUM(缺陷数量) AS 缺陷数量
+												FROM(
+												SELECT
+												TO_CHAR(dfc.CREATETIME,'MM-DD')AS SJ,
+												COUNT(dfc.BARCODE) 缺陷数量
+												FROM TP_PM_DEFECT dfc
+												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
+												WHERE dfc.VALUEFLAG=1 AND TRUNC(dfc.CREATETIME)>= {first} AND TRUNC(dfc.CREATETIME)< {second}
+												GROUP BY dfc.CREATETIME
+												) GROUP BY SJ
+												ORDER BY SJ
+												),
+												一烧产量 AS 
+												(
+												SELECT
+												SJ,
+												SUM(一烧产量) AS 一烧产量
+												FROM
+												(
+												SELECT
+												TO_CHAR(CREATETIME,'MM-DD')AS SJ,
+												 COUNT( * ) 一烧产量 FROM TP_PM_PRODUCTIONDATA 
+												WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELTYPEID=4   
+												and VALUEFLAG=1 AND TRUNC(CREATETIME)>= {first}  AND TRUNC(CREATETIME)<{second}
+												GROUP BY CREATETIME)
+												GROUP BY SJ ORDER BY SJ
+												),
+												一烧出窑量 AS 
+												(
+												SELECT
+												SJ,
+												SUM(一烧出窑量) AS 一烧出窑量
+												FROM(
+												SELECT
+													TO_CHAR(CREATETIME,'MM-DD')AS SJ,
+												 COUNT( * ) 一烧出窑量 FROM TP_PM_PRODUCTIONDATA
+												 WHERE PROCEDUREID IN (14,56)    and VALUEFLAG=1 
+												 AND TRUNC(CREATETIME)>= {first} AND TRUNC(CREATETIME)<{second}
+												 GROUP BY CREATETIME)
+												 GROUP BY  SJ ORDER BY SJ
+												),
+												时间 AS (
+													SELECT
+													TO_CHAR(CREATETIME,'MM-DD')AS SJ
+												  FROM TP_PM_PRODUCTIONDATA
+												 WHERE 
+												  TRUNC(CREATETIME)>= {first} AND TRUNC(CREATETIME)<{second}
+													GROUP BY 	TO_CHAR(CREATETIME,'MM-DD')
+											)
+												
+											
+												SELECT 
+												时间.SJ,
+												NVL( 一烧产量.一烧产量, 0 ) 一烧产量,
+												NVL( 一烧出窑量.一烧出窑量, 0 ) 一烧出窑量,
+												CASE WHEN 一烧出窑量.一烧出窑量 is NULL THEN '0%' ELSE 
+												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',
+												TO_CHAR((  ( NVL( 一烧出窑量.一烧出窑量, 1 )- NVL( 缺陷.缺陷数量, 0 )  )      
+												             / DECODE( NVL( 一烧出窑量.一烧出窑量, 1 ), 0, 1, NVL( 一烧出窑量.一烧出窑量, 1 ) ) ) * 100,'fm99990.0' ) ) END  一烧合格率
+												FROM 时间
+												left JOIN 缺陷 ON 时间.SJ=缺陷.SJ
+												left JOIN 一烧产量 ON 缺陷.SJ=一烧产量.SJ
+												LEFT JOIN 一烧出窑量 ON 一烧出窑量.SJ=时间.SJ
+												ORDER BY 	时间.SJ
+												
+												".Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/Boardkanban/Boardkanban.html

@@ -106,11 +106,11 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>
@@ -311,9 +311,9 @@
                 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[2].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.data.datasets[2].data[n] = (json["rows"][n]["一烧出窑量"]);
                     }
                     }
                     window.DayCL.update();
@@ -346,8 +346,7 @@
 					labels: [],
 					datasets: [
 						{
-							//label: "近七日本烧合格率",
-							label: "一烧合格率",
+							label: "一烧合格率%",
 							fill: false,
 							backgroundColor: color(window.chartColors.red).alpha(0.6).rgbString(),
 							borderColor: window.chartColors.red,
@@ -355,7 +354,6 @@
 							pointRadius: 15,
 							data: []
 						}, {
-							//label: "近七日整体合格率",
 							label: "一烧产量",
 							fill: false,
 							backgroundColor: color(window.chartColors.orange).alpha(0.6).rgbString(),
@@ -365,7 +363,6 @@
 							data: []
                         },
 						{
-							//label: "近七日整体合格率",
 							label: "一烧出窑量",
 							fill: false,
 							backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.ashx

@@ -27,7 +27,14 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
                         );
                 context.Response.Write(json.ToString());
             }
-
+			int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+							string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+							string second = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+							if (day > 25)
+							{
+									first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+									second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+							}
             if (context.Request["m"].ToString() == "StaffTable")
             {
                 string sqlStr = @"SELECT
@@ -65,7 +72,8 @@ 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,39,55,56,57)
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -85,7 +93,8 @@ 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 ( 13,14,55,56 ) 
+												TPPD.PROCEDUREID IN(13,14,39,55,56,57)
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -105,7 +114,8 @@ 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,39,55,56,57)
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -119,8 +129,6 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-
-
             if (context.Request["m"].ToString() == "MonthSum")
             {
                 string sqlStr = @"
@@ -128,7 +136,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													*
 													FROM(
 													select 
-													 CASE WHEN gid=3 THEN pdg.A313 +pdg.A21  end 打磨
+													 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,
@@ -146,8 +154,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, 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
@@ -160,7 +168,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >=  {first}  AND pd.CREATETIME <  {second}
 														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,
@@ -181,129 +189,74 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																			 pdata.productionlineid)
 													 ) pdg
 																				)
-																				WHERE 打磨 is not null	 
+																				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	 
+														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, 11, 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 	 >=  {first}  AND pd.CREATETIME <  {second}
+															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_INPRODUCTION WHERE VALUEFLAG=1
+																	AND CREATETIME 	 >={first} AND CREATETIME <  {second} "	 .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -325,8 +278,9 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56)
+														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
 														AND dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -347,6 +301,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 													WHERE
 													dfc.PROCEDUREID=6
+													AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -364,8 +319,9 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56)
+														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
 														AND dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -378,7 +334,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 (14,56)   and GOODSLEVELID in (4) and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												) 
 	
 												SELECT
@@ -405,12 +361,13 @@ 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(10,37,41)
+												AND dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
+												AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 												),
 											
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)    and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -451,7 +408,8 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
-														AND TMDP.DEFECTPROCEDUREID IN (55,56,45,13,14,39)
+														AND TMDP.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
+														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
 											)
 													";
                 //直接获取不分页数据
@@ -490,7 +448,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														   g.GOODSMODEL,
 														   dd.dictionaryvalue GLAZETYPE
 													, sum(decode(pd.procedureid, 11, 1, 0)) as A313
-													, sum(decode(pd.procedureid, 0, 1, 0)) as A21
+													, sum(decode(pd.procedureid, 0, 0, 0)) as A21
 													  from tp_pm_productiondata pd
 													 inner join tp_mst_goods g
 														on g.goodsid = pd.goodsid
@@ -503,7 +461,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -570,7 +528,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -602,8 +560,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														入库.入库,
 														装窑.装窑
 														FROM 装窑
-														LEFT JOIN 入库 ON 入库.SJ=装窑.SJ
-";
+														LEFT JOIN 入库 ON 入库.SJ=装窑.SJ"	 .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.html

@@ -105,11 +105,11 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>
@@ -184,9 +184,9 @@
 			$.get('BurnIntoKanban.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]["打磨"]);
+                    $('#ydm').text( json["rows"][0]["装窑"]);
+                    $('#ycx').text(json["rows"][1]["装窑"]);
+                    $('#ygx').text(json["rows"][2]["装窑"]);
 
 				}
 			});

wwwroot/main/Procedure/FormingKanban/FormingKanban.ashx

@@ -10,25 +10,32 @@ 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() == "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 = @"
+    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());
+            }
+            int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+            string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+            string second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+            if (day > 25)
+            {
+                first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+                second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+            }
+            if (context.Request["m"].ToString() == "WorkshopSection")
+            {
+                string sqlStr = @"
                  SELECT
                         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注浆数量,
@@ -48,14 +55,14 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												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();
-				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 
@@ -95,7 +102,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= 	{first} AND pd.CREATETIME < {second}
 														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,
@@ -129,25 +136,23 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 															WHERE VALUEFLAG=1
 															AND GROUTINGFLAG=1
 															AND SCRAPFLAG=0 
-															AND GROUTINGDATE >= ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25  AND GROUTINGDATE < ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 2) + 25
+															AND GROUTINGDATE >= {first} AND GROUTINGDATE < 	{second}
 															GROUP BY TO_CHAR(GROUTINGDATE,'MM-DD')
 							)
-							
-
 														SELECT
 														交坯.SJ,
 														CASE WHEN 交坯.交坯 is null THEN 0 else 交坯.交坯 end AS 交坯,
 														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 (
+														RIGHT JOIN 交坯 ON 交坯.SJ=注浆.SJ  ".Replace("{first}",first).Replace("{second}",second);
+                //直接获取不分页数据
+                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
@@ -155,26 +160,39 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												WHERE df.VALUEFLAG=1
 												and dft.DEFECTTYPEID=1
 												AND TRUNC( df.CREATETIME ) = trunc(sysdate) 
+												AND df.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 												),
-												检验数 AS 
+												一烧产量 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=4 AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+												),
+													检验数 AS 
+												(
+											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
 												)
 												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(
+												
+												CASE WHEN  (NVL( 半检缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 >=100
+												THEN 100
+												ELSE
+												(NVL( 半检缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 
+												END,'fm99990.0' ) || '%' ) as 缺陷率
 												FROM  
 												半检缺陷
-												LEFT JOIN 检验数 on 1=1";
-				//直接获取不分页数据
-				DataTable dt = conn.ExecuteDatatable(sqlStr);
-				string jsonStr = new JsonResult(dt).ToJson();
-				context.Response.Write(jsonStr);
-			}
+												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);
+            }
 
-			if (context.Request["m"].ToString() == "MonthSum")
-			{
-				string sqlStr = @"SELECT
+            if (context.Request["m"].ToString() == "MonthSum")
+            {
+                string sqlStr = @"SELECT
 															*
 															FROM(
 															select 
@@ -210,7 +228,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																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 pd.CREATETIME 	 >= 	{first}   AND pd.CREATETIME < {second}
 																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,
@@ -240,16 +258,17 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 															WHERE VALUEFLAG=1
 															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);
-			}
+															AND GROUTINGDATE >= {first}  AND GROUTINGDATE < {second} " .Replace("{first}",first).Replace("{second}",second);
+                //直接获取不分页数据
+                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
 													缺陷名称,
 													缺陷数量 
@@ -262,9 +281,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														df.DEFECTTYPEID = 1 
-														AND dfc.VALUEFLAG = 1 
+																dfc.VALUEFLAG = 1 
 														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -285,9 +305,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														df.DEFECTTYPEID = 1 
-														AND dfc.VALUEFLAG = 1 
-															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														 dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -306,9 +327,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 															TP_PM_DEFECT dfc
 															LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 														WHERE
-															df.DEFECTTYPEID = 1 
-															AND dfc.VALUEFLAG = 1 
-																AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+															 dfc.VALUEFLAG = 1 
+															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+															AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 														GROUP BY
 															dfc.DEFECTNAME 
 														ORDER BY
@@ -318,46 +340,32 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														ROWNUM <= 4 
 													) 
 												),
-												检验数 AS ( SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1  ) SELECT
+												检验数 AS (  	SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)  ) 
+									SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
-												其他缺陷.其他缺陷数量,
-												DECODE(
-													NVL( 缺陷.缺陷数量, 0 ),
-													0,
-													'0%',
-													TO_CHAR(
-														(
-															NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) 
-														) * 100,
-														'fm99990.0' 
-													) || '%' 
-												) 缺陷率,
-												DECODE(
-													NVL( 其他缺陷.其他缺陷数量, 0 ),
-													0,
-													'0%',
-													TO_CHAR(
-														(
-															NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) 
-														) * 100,
-														'fm99990.0' 
-													) || '%' 
-												) 其他缺陷率 
+												NVL(其他缺陷.其他缺陷数量, 0),
+												DECODE( NVL( 缺陷.缺陷数量, 0 ), 0,'0%', TO_CHAR( 
+												CASE WHEN 	( NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100>=100 THEN 100
+												ELSE
+												( NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 END ,'fm99990.0' ) || '%' )  as  缺陷率,
+												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR(
+												CASE WHEN 	(NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100>=100
+												THEN 100
+												ELSE 	(NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 END,'fm99990.0' ) || '%' ) 其他缺陷率 
 											FROM
 												缺陷
 												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);
-			}
-
-			if (context.Request["m"].ToString() == "MonthTable")
-			{
-				string sqlStr = @"
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
 
+            if (context.Request["m"].ToString() == "MonthTable")
+            {
+                string sqlStr = @"
 									SELECT
 										责任工号,
 										生产线号,
@@ -377,38 +385,38 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														LEFT JOIN TP_HR_STAFF stf on stf.STAFFID=class.STAFFID
 														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
 														LEFT JOIN TP_MST_GOODS GD ON PD.GOODSID = GD.GOODSID
 														LEFT JOIN TP_MST_GOODSTYPE GDT ON GD.GOODSTYPEID = GDT.GOODSTYPEID 
-														--INNER JOIN TP_PM_PRODUCTIONDATA PDD ON PD.BARCODE = PDD.BARCODE
 														WHERE 
 														 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);
-			}
+														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  
+														AND TMDP.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') )";
+                //直接获取不分页数据
+                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

@@ -75,9 +75,9 @@
                     </table>
 
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 100%; margin-top: 2%;">
-                        <tr class="tr_title_warning" style="height: 90px; font-size: 45px">
-                            <td colspan="3">成型缺陷率：<span id="cqxl" style="color:white">——</span></td>
-                            <td colspan="3">一烧产量：<span id="scl" style="color:white">——</span></td>
+                        <tr class="tr_title_warning" style="height: 40px; font-size: 30px">
+                            <td colspan="3">成型缺陷率：<span id="cqxl" style="color: white; font-size: 35px">——</span></td>
+                            <td colspan="3">一烧产量：<span id="scl" style="color: white; font-size: 35px ">——</span></td>
                         </tr>
                         <tr class="tr_title_warning" style="height: 60px; font-size: 25px">
                             <td>缺陷</td>
@@ -89,19 +89,19 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>数量</td>
-                            <td id="sl1">1</td>
-                            <td id="sl2">2</td>
-                            <td id="sl3">3</td>
-                            <td id="sl4">4</td>
-                            <td id="sl5">5</td>
+                            <td id="sl1">0</td>
+                            <td id="sl2">0</td>
+                            <td id="sl3">0</td>
+                            <td id="sl4">0</td>
+                            <td id="sl5">0</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>
@@ -256,19 +256,16 @@
 			$.get('FormingKanban.ashx?m=DefectDetail', function (data) {
 				var json = JSON.parse(data);
                 if (json["success"] == true) {
-                    if (json["rows"].length<0) {
+                    if (json["rows"].length>0) {
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
 					$('#qxname2').text(json["rows"][1]["缺陷名称"]);
 					$('#qxname3').text(json["rows"][2]["缺陷名称"]);
 					$('#qxname4').text(json["rows"][3]["缺陷名称"]);
-
 					$('#sl1').text(json["rows"][0]["缺陷数量"]);
 					$('#sl2').text(json["rows"][1]["缺陷数量"]);
 					$('#sl3').text(json["rows"][2]["缺陷数量"]);
 					$('#sl4').text(json["rows"][3]["缺陷数量"]);
                     $('#sl5').text(json["rows"][0]["其他缺陷数量"]);
-
-
 					$('#qxl1').text(json["rows"][0]["缺陷率"]);
 					$('#qxl2').text(json["rows"][1]["缺陷率"]);
 					$('#qxl3').text(json["rows"][2]["缺陷率"]);
@@ -287,7 +284,6 @@
 				}
 			});
 		}
-
         function loadData() {
 			$.get("FormingKanban.ashx?m=rate", function (data) {
                 clearData();
@@ -297,14 +293,11 @@
                         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.update();
                 
             });
         }
-
 		function initData() {
 			window.chartColors = {
 				red: 'rgb(255, 99, 132)',
@@ -315,9 +308,7 @@
 				purple: 'rgb(153, 102, 255)',
 				grey: 'rgb(231,233,237)'
 			};
-
 			var color = Chart.helpers.color;
-
 			window.randomScalingFactor = function (num) {
 				return Math.round(Math.random() * num);
 			}
@@ -387,9 +378,6 @@
 			var ctxDayCL = document.getElementById("canvasDayCL").getContext("2d");
 			window.DayCL = new Chart(ctxDayCL, configDayCL);
 		}
-
-
-
     </script>
 
     <script src="/Plugins/chartjs-2.8.0/chart-2.8.min.js"></script>

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.ashx

@@ -27,6 +27,15 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 						);
 				context.Response.Write(json.ToString());
 			}
+			 
+				int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+							string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+							string second = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+							if (day > 25)
+							{
+									first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+									second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+							}
 
 			if (context.Request["m"].ToString() == "StaffTable")
             {
@@ -162,7 +171,7 @@ SELECT
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -223,7 +232,7 @@ SELECT
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -252,7 +261,7 @@ SELECT
 																				机械.机械,
 																				(机械.机械+人工施釉.人工) AS 总计
 																				FROM 机械
-																				LEFT JOIN 人工施釉 ON 1=1 ";
+																				LEFT JOIN 人工施釉 ON 1=1 " .Replace("{first}",first).Replace("{second}",second);
 								//直接获取不分页数据
 								DataTable dt = conn.ExecuteDatatable(sqlStr);
 								string jsonStr = new JsonResult(dt).ToJson();
@@ -276,6 +285,7 @@ SELECT
 													WHERE
 														dfc.DEFECTPROCEDUREID IN(10,37,41)
 														AND dfc.VALUEFLAG = 1 
+															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -296,6 +306,7 @@ SELECT
 														TP_PM_DEFECT dfc
 													WHERE
 													dfc.PROCEDUREID IN (6,15,16)
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -315,6 +326,7 @@ SELECT
 													WHERE
 															dfc.DEFECTPROCEDUREID IN(10,37,41)
 														AND dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -327,13 +339,14 @@ 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 (14,56)   and GOODSLEVELID in (4) and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												) 
 	
 												SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
-												其他缺陷.其他缺陷数量,
+												NVL(其他缺陷.其他缺陷数量, 0),
+
 												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 缺陷率,
 												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 其他缺陷率
 											FROM
@@ -355,10 +368,11 @@ SELECT
 												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 												WHERE dfc.VALUEFLAG=1
 												AND dfc.DEFECTPROCEDUREID IN(10,37,41)
+												AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and VALUEFLAG=1
+												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)   and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -400,6 +414,7 @@ SELECT
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN(10,37,41)
+														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
 														)
 														";
                 //直接获取不分页数据
@@ -451,7 +466,7 @@ SELECT
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -516,7 +531,7 @@ SELECT
 														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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 														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,
@@ -547,7 +562,7 @@ SELECT
 														机械.机械,
 														(人工.人工+机械.机械) AS 总计
 														FROM 机械
-														LEFT JOIN 人工 ON 人工.SJ=机械.SJ";
+														LEFT JOIN 人工 ON 人工.SJ=机械.SJ" .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.html

@@ -105,11 +105,11 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>
@@ -174,8 +174,8 @@
 			$.get('GlazedKanban.ashx?m=Alltotal', function (data) {
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
-                    $('#yscl').text("一烧出窑数：" + json["rows"][0]["出窑数"]);
-					$('#syqx').text("施釉缺陷率：" + json["rows"][0]["施釉缺陷率"]);
+                    $('#yscl').text( json["rows"][0]["出窑数"]);
+					$('#syqx').text( json["rows"][0]["施釉缺陷率"]);
 				}
 			});
         }

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.ashx

@@ -15,6 +15,15 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+
+            int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+            string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+            string second = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+            if (day > 25)
+            {
+                first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+                second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+            }
             if (context.Request["m"].ToString() == "fwq")
             {
                 string time = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm ");
@@ -34,15 +43,20 @@ 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 df.DEFECTTYPEID=1
+												and TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+												AND  dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+												'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 												),
 												检验数 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
+											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID=4 AND TRUNC( CREATETIME ) = trunc(sysdate)    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(
+												CASE WHEN (NVL( 半检缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.出窑数, 1 ), 0, 1, NVL( 检验数.出窑数, 1 ) ) ) * 100 >=100
+												THEN 100 else  (NVL( 半检缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.出窑数, 1 ), 0, 1, NVL( 检验数.出窑数, 1 ) ) ) * 100 END
+												,'fm99990.0' ) || '%' ) as 缺陷率
 												FROM  
 												半检缺陷
 												LEFT JOIN 检验数 on 1=1";
@@ -52,22 +66,20 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
                 context.Response.Write(jsonStr);
             }
 
-			if (context.Request["m"].ToString() == "pie1")
+            if (context.Request["m"].ToString() == "pie1")
             {
                 string sqlStr = @"SELECT
-										DECODE( NVL( 良品数, 0 ),0,'0%',TO_CHAR((NVL( 良品数, 0 ) / DECODE( NVL( 半检数, 1 ), 0, 1, NVL( 半检数, 1 ) ) ) ,'fm99990.00' )*100 ) as 良品率
+										DECODE( NVL( 良品数, 0 ),0,'0',TO_CHAR((NVL( 良品数, 0 ) / DECODE( NVL( 半检数, 1 ), 0, 1, NVL( 半检数, 1 ) ) ) ,'fm99990.00' )*100 ) as 良品率
 										FROM(
 										SELECT
 										SUM( CASE WHEN PD.GOODSLEVELTYPEID is null THEN 1 ELSE 0 END)
 										+SUM(CASE WHEN PD.GOODSLEVELTYPEID in (1,4) THEN 1 ELSE 0 END)as 良品数,
 										COUNT(pda.BARCODE) as 半检数
 										FROM TP_PM_PRODUCTIONDATA pd
-										INNER  JOIN (
-										SELECT
-										BARCODE
-										FROM TP_PM_PRODUCTIONDATA
-										WHERE PROCEDUREID  IN ( 6,40,31 )
+										INNER  JOIN ( SELECT BARCODE FROM TP_PM_PRODUCTIONDATA 
+										WHERE PROCEDUREID  IN ( 6,40,31 ) AND TRUNC(CREATETIME ) = trunc(sysdate)  
 										) PDA ON PDA.BARCODE=PD.BARCODE
+										WHERE TRUNC(pd.CREATETIME ) = trunc(sysdate)   and  pd.VALUEFLAG=1
 										)";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
@@ -76,10 +88,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
             }
 
 
-			
-				if (context.Request["m"].ToString() == "MonthSum")
-							{
-								string sqlStr = @"with 入库量  AS (SELECT
+
+            if (context.Request["m"].ToString() == "MonthSum")
+            {
+                string sqlStr = @"with 入库量  AS (SELECT
 																			*
 																			FROM(
 																			select 
@@ -115,7 +127,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																				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 pd.CREATETIME 	 >= {first} AND pd.CREATETIME < {second}
 																				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,
@@ -174,7 +186,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																				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 pd.CREATETIME 	 >= {first} AND pd.CREATETIME < {second}
 																				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,
@@ -235,7 +247,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																				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 pd.CREATETIME 	 >= {first}  AND pd.CREATETIME < {second}
 																				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,
@@ -275,12 +287,12 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																										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();
-								context.Response.Write(jsonStr);
-							}
+																										LEFT JOIN 精坯库存 on 1=1 ".Replace("{first}",first).Replace("{second}",second);
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
 
             if (context.Request["m"].ToString() == "DefectDetail")
             {
@@ -297,8 +309,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														df.DEFECTTYPEID = 1 
-														AND dfc.VALUEFLAG = 1 
+														 dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -312,14 +326,16 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													SUM(缺陷数量) 其他缺陷数量
 												FROM
 													(
-																SELECT
+													SELECT
 														dfc.DEFECTNAME 缺陷名称,
 														COUNT( dfc.DEFECTNAME ) 缺陷数量 
 													FROM
 														TP_PM_DEFECT dfc
-
 													WHERE
 													dfc.PROCEDUREID=6
+													AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -336,8 +352,10 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
-														df.DEFECTTYPEID = 1 
-														AND dfc.VALUEFLAG = 1 
+														 dfc.VALUEFLAG = 1 
+														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -350,20 +368,27 @@ 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 (14,56)   and GOODSLEVELID in (4) and VALUEFLAG=1  AND TRUNC( CREATETIME ) = trunc(sysdate) 
 												) 
 	
 												SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
-												其他缺陷.其他缺陷数量,
-												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 缺陷率,
-												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 其他缺陷率
+												NVL(其他缺陷.其他缺陷数量, 0),
+												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',TO_CHAR(
+												CASE WHEN 	(NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 >=100
+												THEN 100
+												ELSE 	(NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 END
+											,'fm99990.0' ) || '%' ) 缺陷率,
+												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR(
+												CASE WHEN (NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100>=100
+												THEN 100
+												ELSE (NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 END
+												,'fm99990.0' ) || '%' ) 其他缺陷率
 											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();
@@ -398,10 +423,11 @@ 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)
-														
-														
-											) ";
+														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
+														AND TMDP.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
+														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球')
+														)
+											 ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -439,6 +465,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 										  LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 										 WHERE
 										  TPPD.PROCEDUREID IN ( 6,40,31 ) 
+											and TRUNC(TPPD.CREATETIME)= TRUNC(SYSDATE)
 										 GROUP BY
 										 THS.STAFFCODE 
 										 ) T) U1
@@ -457,6 +484,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 										  LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 										 WHERE
 										  TPPD.PROCEDUREID IN ( 6,40,31 ) 
+											and TRUNC(TPPD.CREATETIME)= TRUNC(SYSDATE)
 										 GROUP BY
 										 THS.STAFFCODE 
 										 ) T1 ) U2 ON U1.ID = (U2.ID - 1)
@@ -468,7 +496,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-			   if (context.Request["m"].ToString() == "rate")
+            if (context.Request["m"].ToString() == "rate")
             {
                 string sqlStr = @"WITH 入库 AS(SELECT
 													*
@@ -510,7 +538,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= {first} AND pd.CREATETIME < {second}
 														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,
@@ -577,7 +605,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= {first} AND pd.CREATETIME < {second}
 														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,
@@ -644,7 +672,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >= {first} AND pd.CREATETIME < {second}
 														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,
@@ -677,7 +705,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														检验.检验
 														FROM 出库
 														LEFT JOIN 入库 ON 入库.SJ=出库.SJ
-														LEFT JOIN 检验 ON 检验.SJ=入库.SJ ";
+														LEFT JOIN 检验 ON 检验.SJ=入库.SJ ".Replace("{first}", first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.html

@@ -101,19 +101,19 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>数量</td>
-                            <td id="sl1">1</td>
-                            <td id="sl2">2</td>
-                            <td id="sl3">3</td>
-                            <td id="sl4">4</td>
-                            <td id="sl5">5</td>
+                            <td id="sl1">0</td>
+                            <td id="sl2">0</td>
+                            <td id="sl3">0</td>
+                            <td id="sl4">0</td>
+                            <td id="sl5">0</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>
@@ -187,15 +187,15 @@
 		}
         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();
+                $("#StaffTable").animate({ marginTop: -scrollHeight, }, 500,
+                    function () {
+                        $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                        if (--StaffTableRowCount > -1) {
+                        } else {
+                            clearInterval(StaffInterval);
+                            StaffTable();
+                        }
                     }
-                }
             );
         }
 
@@ -242,8 +242,8 @@
 					temp = temp.replace('{数量2}', json["rows"][i]['COUNTS1']);
 					$("#StaffTable").append(temp);
 				}
-				StaffTableRowCount = json["rows"].length;
-				StaffInterval = setInterval(StaffTableScroll, 3000);
+                StaffTableRowCount = json["rows"].length;
+                    StaffInterval = setInterval(StaffTableScroll, 3000);
 			}
 		});
 		}
@@ -290,7 +290,7 @@
 		}
 		function DefectDetails() {
 			$.get('HalfCheckKanban.ashx?m=DefectDetail', function (data) {
-				var json = JSON.parse(data);
+                var json = JSON.parse(data);
 				if (json["success"] == true) {
 					$('#qxname1').text(json["rows"][0]["缺陷名称"]);
 					$('#qxname2').text(json["rows"][1]["缺陷名称"]);
@@ -330,7 +330,7 @@
 			var json = JSON.parse(data);
                 if (json["success"] == true) {
                     var firs = parseFloat(json["rows"][0]["良品率"]);
-					var lpv = firs.toFixed(3);
+					var lpv = firs.toFixed(2);
                     var sencond = 100.00 - parseFloat(json["rows"][0]["良品率"]);
 					window.DefectA.data.datasets[0].data = [lpv, sencond];
 				window.DefectA.update();

wwwroot/main/Procedure/PackagingKanban/PackagingKanban.html

@@ -32,14 +32,15 @@
             <div>
                 <table rules="none" align="right" style="width: 20%; height: 260px; margin-left:80%;margin-top:-291px ">
                     <tr class="tr_bg_dark_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;">0000-00-00 00:00:00</span></strong></td>
                     </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: 5%; height: 200px; font-size: 35px; text-align: center " class="td, th" rowspan="3"><br />月包装量：<span id="yjyl">加载中...</span><br /></td>
                     </tr>
                 </table>
             </div>
+            <br />
+            <br /><br /><br /><br /><br />
             <!--表格-->
             <div style="width:1840px;height:530px;display:flex;flex-direction:row;">
                 <div style="width: 50%;height:530px;padding-right:20px;">
@@ -72,7 +73,7 @@
                             <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%">测试员工</td>
@@ -308,54 +309,6 @@
             };
             var ctxDayCL = document.getElementById("canvasDayCL").getContext("2d");
             window.DayCL = new Chart(ctxDayCL, configDayCL);
-            //===================================================
-
-            ////月饼图===========================================
-            //window.configMonthCL = {
-            //    data: {
-            //        labels: ['待达成', '月达成'],
-            //        datasets: [{
-            //            label: '工序',
-            //            backgroundColor: [
-            //                color(window.chartColors.red).alpha(0.35).rgbString(),
-            //                color(window.chartColors.blue).alpha(0.35).rgbString(),
-            //                color(window.chartColors.green).alpha(0.35).rgbString(),
-            //                color(window.chartColors.orange).alpha(0.35).rgbString(),
-            //                color(window.chartColors.purple).alpha(0.35).rgbString()
-            //            ],
-            //            fill: false,
-            //            borderColor: [
-            //                window.chartColors.red,
-            //                window.chartColors.blue,
-            //                window.chartColors.green,
-            //                window.chartColors.orange,
-            //                window.chartColors.purple
-            //            ],
-            //            borderWidth: 2,
-            //            pointRadius: 30,
-            //            data: [0, 0]
-            //        }]
-            //    },
-            //    type: 'doughnut',
-            //    options: {
-            //        legend: {
-            //            display: true
-            //        },
-            //        title: {
-            //            display: false,
-            //            text: ""
-            //        },
-            //        tooltips: {
-            //            mode: 'point',
-            //            intersect: false
-            //        },
-            //        responsive: true
-
-            //    }
-            //};
-            //var ctxMonthCL = document.getElementById("canvasMonthCL").getContext("2d");
-            //window.MonthCL = new Chart(ctxMonthCL, configMonthCL);
-            ////===================================================
 
         }
 

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.ashx

@@ -27,7 +27,14 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 						);
 				context.Response.Write(json.ToString());
 			}
-
+			   int day = Convert.ToInt32(DateTime.Now.ToString("dd"));
+            string first = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), -1) + 25";
+            string second = " ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+            if (day > 25)
+            {
+                first = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 0) + 25";
+                second = "ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) + 25";
+            }
 			if (context.Request["m"].ToString() == "StaffTable")
             {
                 string sqlStr = @"SELECT
@@ -66,6 +73,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -86,6 +94,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -106,6 +115,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 4, 5, 36 ) 
+												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -119,28 +129,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 = @"
@@ -180,7 +168,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -242,7 +230,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -302,7 +290,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -323,7 +311,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 																			 pdata.productionlineid)
 													 ) pdg
 																				)
-																				WHERE 打磨 is not null	 ";
+																				WHERE 打磨 is not null	".Replace("{first}",first).Replace("{second}",second);
 								//直接获取不分页数据
 								DataTable dt = conn.ExecuteDatatable(sqlStr);
 								string jsonStr = new JsonResult(dt).ToJson();
@@ -348,6 +336,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
 														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
 														AND dfc.VALUEFLAG = 1 
+														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -368,6 +357,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														TP_PM_DEFECT dfc
 													WHERE
 													dfc.PROCEDUREID=6
+													AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -388,6 +378,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														dfc.DEFECTNAME in ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼',
 														'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坏磕','卡球')
 														AND dfc.VALUEFLAG = 1 
+														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -400,15 +391,27 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												 SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) and VALUEFLAG=1
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
 												) 
 	
 												SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
-												其他缺陷.其他缺陷数量,
-												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 缺陷率,
-												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR((NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100,'fm99990.0' ) || '%' ) 其他缺陷率
+												NVL(其他缺陷.其他缺陷数量, 0),
+												DECODE( NVL( 缺陷.缺陷数量, 0 ),0,'0%',TO_CHAR(
+												CASE 
+												WHEN ((NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100 )>=100
+												THEN 100
+												else 
+												(NVL( 缺陷.缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100
+												END ,'fm99990.0' ) || '%' ) 缺陷率,
+												
+												DECODE( NVL( 其他缺陷.其他缺陷数量, 0 ),0,'0%',TO_CHAR(
+												CASE  WHEN ((NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100)>=100
+												THEN 100
+												ELSE
+												(NVL( 其他缺陷.其他缺陷数量, 0 ) / DECODE( NVL( 检验数.一烧出窑数, 1 ), 0, 1, NVL( 检验数.一烧出窑数, 1 ) ) ) * 100
+												END ,'fm99990.0' ) || '%' ) 其他缺陷率
 											FROM
 												缺陷
 												LEFT JOIN 检验数 ON 1 = 1
@@ -428,6 +431,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 												WHERE dfc.VALUEFLAG=1
 												AND dfc.DEFECTPROCEDUREID IN(4,53)
+												and TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 												),
 												擦洗 AS (
 											SELECT
@@ -436,10 +440,15 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 												WHERE dfc.VALUEFLAG=1
 												AND dfc.DEFECTPROCEDUREID IN(5,54)
+												and TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
 												),
-												检验数 AS 
+												一烧产量 AS 
 												(
-												SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  and VALUEFLAG=1
+											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID=4 AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+												),
+													检验数 AS 
+												(
+											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (14,56)  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
 												)
 												SELECT
 												检验数.出窑数 ,
@@ -484,7 +493,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN (4,5,53,54)
-
+														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  
 											)";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
@@ -535,7 +544,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -602,7 +611,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -669,7 +678,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														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 pd.CREATETIME 	 >={first}  AND pd.CREATETIME <{second}
 														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,
@@ -702,7 +711,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														改洗.改洗
 														FROM 擦洗
 														LEFT JOIN 打磨 ON 打磨.SJ=擦洗.SJ
-														LEFT JOIN 改洗 ON 改洗.SJ=打磨.SJ";
+														LEFT JOIN 改洗 ON 改洗.SJ=打磨.SJ" .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.html

@@ -96,19 +96,19 @@
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>数量</td>
-                            <td id="sl1">1</td>
-                            <td id="sl2">2</td>
-                            <td id="sl3">3</td>
-                            <td id="sl4">4</td>
-                            <td id="sl5">5</td>
+                            <td id="sl1">0</td>
+                            <td id="sl2">0</td>
+                            <td id="sl3">0</td>
+                            <td id="sl4">0</td>
+                            <td id="sl5">0</td>
                         </tr>
                         <tr class="tr_bg_light_warning" style="height: 60px; font-size: 25px ">
                             <td>缺陷率</td>
-                            <td id="qxl1">测试</td>
-                            <td id="qxl2">测试</td>
-                            <td id="qxl3">测试</td>
-                            <td id="qxl4">测试</td>
-                            <td id="qxl5">测试</td>
+                            <td id="qxl1">0%</td>
+                            <td id="qxl2">0%</td>
+                            <td id="qxl3">0%</td>
+                            <td id="qxl4">0%</td>
+                            <td id="qxl5">0%</td>
                         </tr>
                     </table>
                 </div>