看板的无数据的日期的补齐

wwwroot/main/Procedure/Boardkanban/Boardkanban.ashx

@@ -72,7 +72,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USER THS ON THS.USERID = TMUS.USERID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.USERCODE 
 											) T 
@@ -93,7 +93,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USER THS ON THS.USERID = TMUS.USERID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.USERCODE 
 											) T1 
@@ -114,7 +114,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_USER THS ON THS.USERID = TMUS.USERID 
 											WHERE
 												TPPD.PROCEDUREID IN ( 15,16,27,28 ) 
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.USERCODE 
 											) T 
@@ -130,7 +130,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 			if (context.Request["m"].ToString() == "MonthSum")
 				{
 				string sqlStr = @"	WITH  一烧出窑量 as (SELECT  COUNT(*) AS 一烧出窑量 FROM TP_PM_PRODUCTIONDATA 
-													WHERE PROCEDUREID IN(16) AND VALUEFLAG=1  AND TRUNC(CREATETIME)>={first} AND TRUNC(CREATETIME)<={second} 
+													WHERE PROCEDUREID IN(16) AND VALUEFLAG=1  AND  (CREATETIME)>={first} AND  (CREATETIME)<={second} 
 													),
 													一烧产量 as (
 
@@ -173,7 +173,7 @@ FROM
 	AND PDS.VALUEFLAG = 1 
 WHERE
 	pd.VALUEFLAG = 1 
-	AND TRUNC(PD.CREATETIME)>=  {first}AND TRUNC(PD.CREATETIME)< {second}
+	AND  (PD.CREATETIME)>=  {first}AND  (PD.CREATETIME)< {second}
 	AND pd.PROCEDUREID = 16 
 	) 
 	) 
@@ -302,7 +302,7 @@ SELECT
 													FROM
 														TP_PM_DEFECT dfc
 													WHERE
-												 TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+												  (dfc.CREATETIME)>=TRUNC(SYSDATE)
 												 AND dfc.PROCEDUREID<>28
 													GROUP BY
 														dfc.DEFECTNAME
@@ -394,7 +394,7 @@ FROM
 	AND PDS.VALUEFLAG = 1 
 WHERE
 	pd.VALUEFLAG = 1 
-	AND TRUNC( PD.CREATETIME ) = trunc(sysdate) 
+	AND  ( PD.CREATETIME ) >= trunc(sysdate) 
 	AND pd.PROCEDUREID = 16 
 	) 
 	) 
@@ -404,7 +404,7 @@ WHERE
 						WHERE 					GOODSLEVELTYPEID in(4,5)	),
 												检验数 AS 
 												(
-											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
+											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE) 
 												)
 												SELECT
 												一烧产量.出窑数,
@@ -448,7 +448,7 @@ SELECT
 											 PD.VALUEFLAG = '1' --有效
 											AND TMDP.VALUEFLAG = '1' --有效  
 											AND PD.PROCEDUREID=16
-											AND TRUNC(TMDP.CREATETIME)=TRUNC(SYSDATE)
+											AND  (TMDP.CREATETIME)>=TRUNC(SYSDATE)
 											)
 											UNION ALL
 											SELECT
@@ -475,7 +475,7 @@ SELECT
 											 PD.VALUEFLAG = '1' --有效
 											AND PD.PROCEDUREID=16
 											AND (pd.GOODSLEVELTYPEID=4 OR pd.GOODSLEVELTYPEID=null)
-											AND TRUNC(pd.CREATETIME)=TRUNC(SYSDATE) 
+											AND  (pd.CREATETIME)>=TRUNC(SYSDATE) 
 											)
 											)
 											ORDER BY 产品编码";
@@ -529,7 +529,7 @@ FROM
 	AND PDS.VALUEFLAG = 1 
 WHERE
 	pd.VALUEFLAG = 1 
-	AND TRUNC(PD.CREATETIME)>=  {first} AND TRUNC(PD.CREATETIME)< {second}
+	AND  (PD.CREATETIME)>=  {first} AND  (PD.CREATETIME)< {second}
 	AND pd.PROCEDUREID = 16 
 	) 
 	) 
@@ -550,7 +550,7 @@ WHERE
 													TO_CHAR(CREATETIME,'MM-DD')AS SJ,
 												 COUNT( * ) 一烧出窑量 FROM TP_PM_PRODUCTIONDATA
 												 WHERE PROCEDUREID =16     and VALUEFLAG=1 
-												 AND TRUNC(CREATETIME)>=  {first} AND TRUNC(CREATETIME)< {second}
+												 AND  (CREATETIME)>=  {first} AND  (CREATETIME)< {second}
 												 GROUP BY CREATETIME)
 												 GROUP BY  SJ ORDER BY SJ
 												),

wwwroot/main/Procedure/BurnIntoKanban/BurnIntoKanban.ashx

@@ -73,7 +73,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(13,14,39,55,56,57)
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -94,7 +94,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(13,14,39,55,56,57)
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -115,7 +115,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(13,14,39,55,56,57)
-												AND TRUNC(TPPD.CREATETIME)=TRUNC(SYSDATE)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -279,7 +279,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													WHERE
 														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
 														AND dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -299,7 +299,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													FROM
 														TP_PM_DEFECT dfc
 													WHERE
-													 TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+													  ( dfc.CREATETIME ) >= trunc(sysdate) 
 												AND	 dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
 												AND dfc.VALUEFLAG = 1 
 													GROUP BY
@@ -321,7 +321,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													WHERE
 														dfc.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
 														AND dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -334,7 +334,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16   and VALUEFLAG=1 AND TRUNC( CREATETIME ) = trunc(sysdate) 
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16   and VALUEFLAG=1 AND  ( CREATETIME ) >= trunc(sysdate) 
 												) 
 	
 												SELECT
@@ -362,15 +362,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 (13,14,39,55,56,57)
-												AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+												AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 												),
 													一烧产量 AS 
 												(
-											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (1,4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (1,4,5) AND  ( CREATETIME ) >= trunc(sysdate)    and VALUEFLAG=1 
 												),
 												检验数 AS 
 												(
-										SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+										SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												)
 												SELECT
 												一烧产量.出窑数 ,
@@ -413,7 +413,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN (13,14,39,55,56,57)
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate) 
 											)
 													";
                 //直接获取不分页数据
@@ -557,14 +557,26 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 																				ORDER BY pdg.SJ
 														)
 						
-							)
+													),
+												
+												
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
 														
-														SELECT
-														入库.SJ,
-														入库.入库,
-														装窑.装窑
-														FROM 装窑
-														LEFT JOIN 入库 ON 入库.SJ=装窑.SJ"	 .Replace("{first}",first).Replace("{second}",second);
+														SELECT 时间.sj
+														  ,NVL(入库.入库, 0 ) 入库
+														  ,NVL(装窑.装窑, 0 ) 装窑 
+													  FROM 时间
+													  LEFT JOIN 装窑
+														ON 装窑.sj = 时间.sj
+													  LEFT JOIN 入库
+														ON 入库.sj = 时间.sj
+														ORDER BY 	时间.ysj"	 .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/FormingKanban/FormingKanban.ashx

@@ -19,8 +19,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
                 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)
+                          new JProperty("success", true),new JProperty("sj", time)
                         );
                 context.Response.Write(json.ToString());
             }
@@ -134,13 +133,25 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 															AND GROUTINGFLAG=1
 															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 ".Replace("{first}",first).Replace("{second}",second);
+														),
+												
+												
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
+														SELECT 时间.sj
+														  ,nvl(交坯.交坯, 0) 交坯
+														  ,nvl(注浆.注浆, 0) 注浆
+													  FROM 时间
+													  LEFT JOIN 交坯
+														ON 交坯.sj = 时间.sj
+													  LEFT JOIN 注浆
+														ON 注浆.sj = 时间.sj
+													 ORDER BY 时间.ysj ".Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -155,7 +166,7 @@ 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 TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+												and  (dfc.CREATETIME)>=TRUNC(SYSDATE)
 												AND  df.DEFECTTYPEID=1
 												),
 												一烧产量 AS 
@@ -199,7 +210,7 @@ FROM
 	AND PDS.VALUEFLAG = 1 
 WHERE
 	pd.VALUEFLAG = 1 
-	AND TRUNC(PD.CREATETIME)=TRUNC(SYSDATE) 
+	AND  (PD.CREATETIME)>=TRUNC(SYSDATE) 
 	AND pd.PROCEDUREID = 16 
 	) 
 	) 
@@ -209,7 +220,7 @@ WHERE
 												),
 											检验数 AS 
 												(
-											  SELECT COUNT( DISTINCT BARCODE ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
+											  SELECT COUNT( DISTINCT BARCODE ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE) 
 												)
 												SELECT
 												一烧产量.出窑数 ,
@@ -315,7 +326,7 @@ WHERE
 													WHERE
 																dfc.VALUEFLAG = 1 
 																AND df.DEFECTTYPEID=1
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -337,7 +348,7 @@ WHERE
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
 														 dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 														AND df.DEFECTTYPEID=1
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -358,7 +369,7 @@ WHERE
 															LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 														WHERE
 															 dfc.VALUEFLAG = 1 
-															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+															AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 															AND df.DEFECTTYPEID=1
 														GROUP BY
 															dfc.DEFECTNAME 
@@ -369,7 +380,7 @@ WHERE
 														ROWNUM <= 4 
 													) 
 												),
-												检验数 AS (  	SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16   and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)  ) 
+												检验数 AS (  	SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16   and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)  ) 
 											SELECT
 												缺陷.缺陷名称,
 												缺陷.缺陷数量,
@@ -417,7 +428,7 @@ WHERE
 														WHERE 
 														PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate)  
 														AND DF.DEFECTTYPEID=1
 															AND DF.DEFECTTYPEID=1
 														

wwwroot/main/Procedure/GlazedKanban/GlazedKanban.ashx

@@ -74,7 +74,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(10,37,41)
-												AND TRUNC( TPPD.CREATETIME ) = trunc(sysdate) 
+												AND  ( TPPD.CREATETIME ) >= trunc(sysdate) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -95,7 +95,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(10,37,41)
-												AND TRUNC( TPPD.CREATETIME ) = trunc(sysdate) 
+												AND  ( TPPD.CREATETIME ) >= trunc(sysdate) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -116,7 +116,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_HR_STAFF THS ON THS.STAFFID = TMUS.STAFFID 
 											WHERE
 												TPPD.PROCEDUREID IN(10,37,41)
-												AND TRUNC( TPPD.CREATETIME ) = trunc(sysdate) 
+												AND  ( TPPD.CREATETIME ) >= trunc(sysdate) 
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -284,7 +284,7 @@ SELECT
 													WHERE
 														dfc.DEFECTPROCEDUREID IN(10,37,41)
 														AND dfc.VALUEFLAG = 1 
-															AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+															AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -305,7 +305,7 @@ SELECT
 														TP_PM_DEFECT dfc
 													WHERE
 														dfc.DEFECTPROCEDUREID IN (10,37,41)
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -325,7 +325,7 @@ SELECT
 													WHERE
 															dfc.DEFECTPROCEDUREID IN(10,37,41)
 														AND dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -338,7 +338,7 @@ SELECT
 												检验数 
 												AS 
 												(
-												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												) 
 	
 												SELECT
@@ -402,11 +402,11 @@ SELECT
 												INNER JOIN TP_PM_PRODUCTIONDATA PDS ON PDS.BARCODE = PD.BARCODE AND PDS.VALUEFLAG=1 
 												),
 												一烧产量 AS (
-													  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) AND GOODSLEVELID IN (1,4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+													  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) AND GOODSLEVELID IN (1,4,5) AND  ( CREATETIME ) >= trunc(sysdate)    and VALUEFLAG=1 
 												),
 													检验数 AS 
 												(
-											SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+											SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												)
 												SELECT
 												一烧产量.出窑数 ,
@@ -449,7 +449,7 @@ SELECT
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTPROCEDUREID IN(10,37,41)
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate) 
 														)
 														";
                 //直接获取不分页数据
@@ -587,17 +587,29 @@ SELECT
 														   pdata.GOODSMODEL,
 														   pdata.GLAZETYPE
 													 ) pdg
-													 GROUP BY pdg.SJ
-													 ORDER BY pdg.SJ
-														) )
+													 GROUP BY pdg.SJ 
+														) ),
+												
+												
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
 
-														SELECT
-														人工.SJ,
-														人工.人工,
-														机械.机械,
-														(人工.人工+机械.机械) AS 总计
-														FROM 机械
-														LEFT JOIN 人工 ON 人工.SJ=机械.SJ" .Replace("{first}",first).Replace("{second}",second);
+													
+													SELECT 时间.sj
+														  ,NVL(人工.人工, 0 ) 人工
+														  ,NVL(机械.机械, 0 ) 机械
+														  ,(NVL(人工.人工, 0 ) + NVL(机械.机械, 0 )) AS 总计
+													  FROM 时间
+													  LEFT JOIN 人工
+														ON 人工.sj = 时间.sj
+													  LEFT JOIN 机械
+														ON 机械.sj = 时间.sj
+														ORDER BY 	时间.ysj" .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.ashx

@@ -81,11 +81,11 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												),
 													一烧产量 AS 
 												(
-											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (1,4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (1,4,5) AND  ( CREATETIME ) >= trunc(sysdate)    and VALUEFLAG=1 
 												),
 												检验数 AS 
 												(
-										SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+										SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												)
 												SELECT
 												一烧产量.出窑数 ,
@@ -328,7 +328,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
 														 dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 														AND dfc.DEFECTCODE IN ('01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35')  
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -349,7 +349,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													FROM
 														TP_PM_DEFECT dfc
 													WHERE
-													 TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+													  ( dfc.CREATETIME ) >= trunc(sysdate) 
 														AND dfc.DEFECTCODE IN ('01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35')  
 													GROUP BY
 														dfc.DEFECTNAME
@@ -368,7 +368,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 													WHERE
 														 dfc.VALUEFLAG = 1 
-														AND TRUNC( dfc.CREATETIME ) = trunc(sysdate) 
+														AND  ( dfc.CREATETIME ) >= trunc(sysdate) 
 														AND dfc.DEFECTCODE IN ('01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35')  
 													GROUP BY
 														dfc.DEFECTNAME 
@@ -382,7 +382,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+												SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												) 
 	
 												SELECT
@@ -438,7 +438,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE 
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate) 
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate) 
 														AND TMDP.DEFECTCODE IN ('01','02','03','04','05','06','07','08','09','10','19','20','25','26','27','28','29','30','12','13','14','15','16','17','18','23','31','32','33','34','35')  
 														)
 											 ";
@@ -485,7 +485,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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -506,7 +506,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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -527,7 +527,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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -740,16 +740,30 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													 							GROUP BY pdg.SJ
 																				ORDER BY pdg.SJ
 														)
-														)
+														),
+												
+												
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
 
-														SELECT
-														入库.SJ,
-														入库.入库,
-														出库.出库,
-														检验.检验
-														FROM 出库
-														LEFT JOIN 入库 ON 入库.SJ=出库.SJ
-														LEFT JOIN 检验 ON 检验.SJ=入库.SJ ".Replace("{first}", first).Replace("{second}",second);
+														SELECT 时间.sj
+															  ,nvl(入库.入库, 0) 入库
+															  ,nvl(出库.出库, 0) 出库
+															  ,nvl(检验.检验, 0) 检验
+														  FROM 时间
+														  LEFT JOIN 出库
+															ON 出库.sj = 时间.sj
+														  LEFT JOIN 入库
+															ON 入库.sj = 时间.sj
+														  LEFT JOIN 检验
+															ON 检验.sj = 时间.sj  
+														 ORDER BY 时间.ysj
+														  ".Replace("{first}", first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/PackagingKanban/PackagingKanban.ashx

@@ -43,7 +43,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														WHERE pd.PROCEDUREID=17
 														AND pd.VALUEFLAG=1
 														AND pd.ACCOUNTID=1
-														AND TRUNC(pd.CREATETIME)=TRUNC(SYSDATE)
+														AND  (pd.CREATETIME)>=TRUNC(SYSDATE)
 														";
 								//直接获取不分页数据
 								DataTable dt = conn.ExecuteDatatable(sqlStr);
@@ -60,7 +60,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 									WHERE PROCEDUREID=17
 									AND VALUEFLAG=1
 									AND ACCOUNTID=1
-									AND TRUNC(CREATETIME)=TRUNC(SYSDATE) group by GOODSCODE,GOODSNAME";
+									AND  (CREATETIME)>=TRUNC(SYSDATE) group by GOODSCODE,GOODSNAME";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -92,7 +92,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 										WHERE pd.PROCEDUREID=17
 										AND pd.VALUEFLAG=1
 										AND pd.ACCOUNTID=1
-										AND TRUNC(pd.CREATETIME)=TRUNC(SYSDATE)
+										AND  (pd.CREATETIME)>=TRUNC(SYSDATE)
 										GROUP BY us.USERNAME,pd.GOODSCODE,pd.GOODSNAME";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
@@ -163,14 +163,21 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 														   pdata.GOODSMODEL,
 														   pdata.GLAZETYPE
 													 ) pdg
-													 GROUP BY pdg.SJ
-													 ORDER BY pdg.SJ
-														)
-							)
-														SELECT
-														SJ,
-														包装数量
-														FROM 包装" .Replace("{first}",first).Replace("{second}",second);
+													 GROUP BY pdg.SJ 
+														) ), 
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
+														SELECT 时间.sj
+													  ,NVL(包装.包装数量, 0 ) 包装数量 
+												  FROM 时间
+												  LEFT JOIN 包装
+													ON 包装.sj = 时间.sj
+												 ORDER BY 	时间.ysj" .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/RefinementKanban/RefinementKanban.ashx

@@ -73,7 +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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -94,7 +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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T1 
@@ -115,7 +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)
+												AND  (TPPD.CREATETIME)>=TRUNC(SYSDATE)
 											GROUP BY
 												THS.STAFFCODE 
 											) T 
@@ -333,7 +333,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													WHERE
 														dfc.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35',  '12', '13', '14', '15', '16', '17', '18', '19', '23', '25') 
 														AND dfc.VALUEFLAG = 1 
-														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+														AND  (dfc.CREATETIME)>=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -355,7 +355,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													WHERE
 														dfc.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35',  '12', '13', '14', '15', '16', '17', '18', '19', '23', '25') 
 														AND dfc.VALUEFLAG = 1 
-													AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+													AND  (dfc.CREATETIME)>=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME
 													ORDER BY
@@ -375,7 +375,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													WHERE
 														dfc.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35',  '12', '13', '14', '15', '16', '17', '18', '19', '23', '25') 
 														AND dfc.VALUEFLAG = 1 
-														AND TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
+														AND  (dfc.CREATETIME)>=TRUNC(SYSDATE)
 													GROUP BY
 														dfc.DEFECTNAME 
 													ORDER BY
@@ -388,7 +388,7 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 												检验数 
 												AS 
 												(
-											SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE)
+											SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND  (CREATETIME)>=TRUNC(SYSDATE)
 												) 
 												SELECT
 												缺陷.缺陷名称,
@@ -464,7 +464,7 @@ COUNT( DISTINCT   CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND PDS.VALUEFLAG=1 AND
 												
 												一烧产量 AS 
 												(
-											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) AND GOODSLEVELID IN (1,4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16) AND GOODSLEVELID IN (1,4,5) AND  ( CREATETIME ) >= trunc(sysdate)    and VALUEFLAG=1 
 												),
 													检验数 AS 
 												(
@@ -515,7 +515,7 @@ COUNT( DISTINCT   CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND PDS.VALUEFLAG=1 AND
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '23', '25' , '35'  )
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate)  
 													UNION ALL 
 	
 	
@@ -541,7 +541,7 @@ COUNT( DISTINCT   CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND PDS.VALUEFLAG=1 AND
 														 PD.VALUEFLAG = '1' --有效
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TMDP.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '28', '34', '35' )
-														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  ";
+														AND  ( TMDP.CREATETIME ) >= trunc(sysdate)  ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -749,16 +749,29 @@ COUNT( DISTINCT   CASE WHEN PDS.PROCEDUREID IN (5,36,52) AND PDS.VALUEFLAG=1 AND
 													 							GROUP BY pdg.SJ
 																				ORDER BY pdg.SJ
 														)
-														)
+														),
+												
+												
+													时间 AS (
+														SELECT to_char({first} + (LEVEL - 1), 'MM-DD') AS sj
+														  ,to_char({first} + (LEVEL - 1), 'YYYY-MM-DD') AS ysj
+													  FROM dual
+														CONNECT BY LEVEL <= (to_date(to_char(SYSDATE, 'YYYY-MM-DD'), 'YYYY-MM-DD') -
+															   to_date(to_char({first}, 'YYYY-MM-DD'), 'YYYY-MM-DD') + 1)
+													)
 
-														SELECT
-														打磨.SJ,
-														打磨.打磨,
-														擦洗.擦洗,
-														改洗.改洗
-														FROM 擦洗
-														LEFT JOIN 打磨 ON 打磨.SJ=擦洗.SJ
-														LEFT JOIN 改洗 ON 改洗.SJ=打磨.SJ" .Replace("{first}",first).Replace("{second}",second);
+														SELECT 时间.sj
+														  ,nvl(打磨.打磨, 0) 打磨
+														  ,nvl(擦洗.擦洗, 0) 擦洗
+														  ,nvl(改洗.改洗, 0) 改洗
+													  FROM 时间
+													  LEFT JOIN 擦洗
+														ON 擦洗.sj = 时间.sj
+													  LEFT JOIN 打磨
+														ON 打磨.sj = 时间.sj
+													  LEFT JOIN 改洗
+														ON 改洗.sj = 时间.sj
+													 ORDER BY 时间.ysj" .Replace("{first}",first).Replace("{second}",second);
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();