看板调整

wwwroot/main/Procedure/test14/demo.ashx

@@ -674,38 +674,32 @@ public class demo : IHttpHandler
                 //判断是否开启施釉每日成品冷补缺陷率(前7日)
                 string repair = context.Request["repair"].ToString();
                 //出窑数 
-                string sqlStr1 = "SELECT " +
-                    "DISTINCT CASE WHEN  COUNT( TPPD.BARCODE ) IS NULL THEN 0 ELSE COUNT( TPPD.BARCODE ) END 出窑数," +
-                    "to_char( temp.CREATETIME, '"+type+"' ) AS CREATETIME " +
-                    "FROM " +
-                    "TP_PM_ProductionData TPPD " +
-                    "INNER JOIN tp_mst_goods ON tp_mst_goods.goodsid = TPPD.Goodsid " +
-                    "INNER JOIN tp_mst_goodstype ON tp_mst_goodstype.goodstypeid = tp_mst_goods.goodstypeid " +
-                    "INNER JOIN TP_MST_RptTProcedure ON TP_MST_RptTProcedure.Procedureid = TPPD.Procedureid " +
-                    "INNER JOIN tp_pc_procedure pcp ON pcp.procedureid = TPPD.Procedureid " +
-                    "INNER JOIN ( " +
-                                  "SELECT pd.Barcode, pd.Createtime " +
-                                  "FROM TP_PM_ProductionData pd " +
-                                  "INNER JOIN tp_pm_groutingdailydetail gdd ON gdd.groutingdailydetailid = pd.groutingdailydetailid " +
-                                  "WHERE pd.Accountid = 1 " +
-                                  "AND pd.isrefire = '0' " +
-                                  "AND pd.islengbu = '0' " +
-                                  "AND ( " +
-                                  "( pd.procedureid = 11 AND pd.valueflag = '1' AND ( pd.checkflag = '1' OR pd.checkflag IS NULL ) ) " +
-                                  "OR ( pd.procedureid = 104 AND pd.checkflag = '1' ) " +
-                                  ") " +
-                                  "AND PD.KILNID IN ( 1, 2, 5 )  " +
-                                  "AND PD.CREATETIME >=  CASE WHEN '"+type+"' = 'yyyymm' THEN TRUNC(ADD_MONTHS(SYSDATE, -6), 'MM')" +
-                                  "ELSE TRUNC(SYSDATE - 6) END  "+
-                                  ") temp ON TPPD.Barcode = temp.barcode " +
-                    "AND TPPD.createtime <= temp.createtime " +
-                    "WHERE TPPD.Valueflag = '1' " +
-                    "AND TP_MST_RptTProcedure.Rptprocedureid = 1 " +
-                    "AND instr( ',' || '98' || ',', ',' || TP_MST_RptTProcedure.ProcedureId || ',' ) > 0 " +
-                    "AND TPPD.usercode IN ( 'SSY001', 'SSY002', 'SSY004', 'SSY005' ) "+
-                    "GROUP BY to_char( temp.CREATETIME, '"+type+"') " +
-                    "ORDER BY to_char( temp.CREATETIME, '"+type+"' ) DESC ";
-
+				
+				string sqlStr1 = "SELECT nvl(COUNT(TPPD.groutingdailydetailid),0) 出窑数,\n" +
+				"       temp.CTT AS CREATETIME\n" + 
+				"  FROM (SELECT pd.groutingdailydetailid, pd.Createtime,to_char(pd.CREATETIME,  '"+type+"') CTT\n" + 
+				"               FROM TP_PM_ProductionData pd\n" + 
+				"              WHERE pd.Accountid = 1\n" + 
+				"                AND pd.isrefire = '0'\n" + 
+				"                AND pd.islengbu = '0'\n" + 
+				"                AND ((pd.procedureid = 11 AND pd.valueflag = '1' AND\n" + 
+				"                    (pd.checkflag = '1' OR pd.checkflag IS NULL)) OR\n" + 
+				"                    (pd.procedureid = 104 AND pd.checkflag = '1'))\n" + 
+				"                AND PD.KILNID IN (1, 2, 5)\n" + 
+				"                AND PD.CREATETIME >= CASE\n" + 
+				"                      WHEN  '"+type+"' = 'yyyymm' THEN\n" + 
+				"                      TRUNC(ADD_MONTHS(SYSDATE, -6), 'MM')\n" +  
+				"                      ELSE\n" + 
+				"                       TRUNC(SYSDATE - 6)\n" + 
+				"                    END) temp\n" + 
+				"\n" + 
+				"  INNER JOIN TP_PM_ProductionData TPPD on TPPD.groutingdailydetailid = temp.groutingdailydetailid\n" + 
+				" WHERE TPPD.Valueflag = '1'\n" + 
+				"   and TPPD.ProcedureId = 98\n" + 
+				"   AND TPPD.usercode IN ('SSY001', 'SSY002', 'SSY004', 'SSY005')\n" + 
+				" GROUP BY temp.CTT\n" + 
+				" ORDER BY temp.CTT DESC";
+   
                 //直接获取不分页数据
                 DataTable dt1 = conn.ExecuteDatatable(sqlStr1);
                 //成检不合格数 
@@ -769,6 +763,98 @@ public class demo : IHttpHandler
                 context.Response.Write(jsonStr);
             }
         }
+		using (IDataAccess conn = DataAccess.Create())
+        {
+            //施釉每日成品合格率(前7日)&&施釉每月成品合格率(前7月)&&施釉每日成品冷补缺陷率(前7日)
+            if (context.Request["m"].ToString() == "Dailypassratenew")
+            { 
+                //出窑数 
+				
+				string sqlStr1 = "SELECT nvl(COUNT(TPPD.groutingdailydetailid),0) 出窑数,\n" +
+				"       temp.CTT AS CREATETIME\n" + 
+				"  FROM (SELECT pd.groutingdailydetailid, pd.Createtime,to_char(pd.CREATETIME, 'yyyymm') CTT\n" + 
+				"               FROM TP_PM_ProductionData pd\n" + 
+				"              WHERE pd.Accountid = 1\n" + 
+				"                AND pd.isrefire = '0'\n" + 
+				"                AND pd.islengbu = '0'\n" + 
+				"                AND ((pd.procedureid = 11 AND pd.valueflag = '1' AND\n" + 
+				"                    (pd.checkflag = '1' OR pd.checkflag IS NULL)) OR\n" + 
+				"                    (pd.procedureid = 104 AND pd.checkflag = '1'))\n" + 
+				"                AND PD.KILNID IN (1, 2, 5)\n" + 
+				"                AND PD.CREATETIME >= CASE\n" + 
+				"                      WHEN 'yyyymm' = 'yyyymm' THEN\n" + 
+				"                      TRUNC(sysdate,'MM')\n" + 
+				"                      ELSE\n" + 
+				"                       TRUNC(SYSDATE - 6)\n" + 
+				"                    END) temp\n" + 
+				"\n" + 
+				"  INNER JOIN TP_PM_ProductionData TPPD on TPPD.groutingdailydetailid = temp.groutingdailydetailid\n" + 
+				" WHERE TPPD.Valueflag = '1'\n" + 
+				"   and TPPD.ProcedureId = 98\n" + 
+				"   AND TPPD.usercode IN ('SSY001', 'SSY002', 'SSY004', 'SSY005')\n" + 
+				" GROUP BY temp.CTT\n" + 
+				" ORDER BY temp.CTT DESC";
+
+                //直接获取不分页数据
+                DataTable dt1 = conn.ExecuteDatatable(sqlStr1);
+                //成检不合格数 
+                string sqlStr2 = "SELECT DISTINCT " +
+                    "NVL( COUNT( DISTINCT pmd.BARCODE ), 0 ) 成检不合格数, " +
+                    "to_char( pmd.CREATETIME, 'yyyymm' ) AS CREATETIME " +
+                    "FROM " +
+                    "tp_pm_defect pmd " +
+                    "INNER JOIN TP_PM_PRODUCTIONDATA PD ON PMD.PRODUCTIONDATAID = PD.PRODUCTIONDATAID " +
+                    "AND PD.MODELTYPE IN ( - 1, - 4, - 5 ) " +
+                    "AND PD.VALUEFLAG = '1' " +
+                    "AND PD.CHECKBATCHNO = 1 " +
+                    "AND PD.ISREFIRE = '0' " +
+                    "LEFT JOIN TP_MST_Defect mstd ON pmd.DefectID = mstd.DefectID " +
+                    "LEFT JOIN TP_MST_DefectType dt ON mstd.DefectTypeID = dt.DefectTypeID " +
+                    "LEFT JOIN TP_PM_GroutingDailyDetail gdd ON gdd.Groutingdailydetailid = pd.Groutingdailydetailid " +
+                    "INNER JOIN tp_pm_productiondata hopd ON hopd.kilncarbatchno = pd.kilncarbatchno " +
+                    "AND hopd.barcode = pd.barcode " +
+                    "AND ( ( hopd.procedureid = 11 AND hopd.valueflag = '1' ) " +
+                          "OR ( hopd.procedureid = 104 AND hopd.isrefire = '0' AND hopd.checkflag = '1' ))  " +
+                    "WHERE pmd.valueflag = '1' " +
+                    "AND instr( pd.KilnCode, '3' ) > 0 " +
+                    "AND dt.DefectTypeID IN(5) " +
+                    "AND gdd.RECYCLINGFLAG = '0' " +
+                    "AND pmd.CREATETIME >=  TRUNC(  SYSDATE, 'MM' ) " +
+                    "AND ( pd.GOODSLEVELID IN ( 6, 7 ) AND pmd.DefectDeductionNum = 1" +
+                              "AND pmd.DEFECTUSERCODE IN ( 'SSY001', 'SSY002', 'SSY004', 'SSY005' ) )  " +
+                    "GROUP BY to_char( pmd.CREATETIME, 'yyyymm' ) " +
+                    "ORDER BY to_char( pmd.CREATETIME, 'yyyymm' ) DESC";
+                //直接获取不分页数据
+                DataTable dt2 = conn.ExecuteDatatable(sqlStr2);
+                DataTable restultDay = new DataTable();
+                restultDay.Columns.Add("出窑数");
+                restultDay.Columns.Add("施釉合格率");
+                restultDay.Columns.Add("日期");
+                DateTime dateTime = DateTime.Now;
+                //创建施釉缺陷所需数据
+                for (int i = 6; i >= 0; i--)
+                { 
+					string day=dateTime.AddDays(-i).ToString("yyyyMMdd");
+                    string month = dateTime.AddMonths(-i).ToString("yyyyMM");
+
+                    //出窑数
+                    var kilnexits = dt1.AsEnumerable().
+                            Where(ex => ex.Field<string>("CREATETIME") == (month)).
+                            Select(ex => ex.Field<decimal>("出窑数")).FirstOrDefault();
+                    //成检不合格数
+                    var unqualified = dt2.AsEnumerable().
+                            Where(ex => ex.Field<string>("CREATETIME") == ( month)).
+                            Select(ex => ex.Field<decimal>("成检不合格数")).FirstOrDefault();
+                    DataRow dr = restultDay.NewRow();
+                    dr["出窑数"] = kilnexits;
+                    dr["施釉合格率"] = (kilnexits - unqualified)<=0?"0":((kilnexits - unqualified) / kilnexits).ToString("p2");
+                    dr["日期"] = dateTime.ToString("yy") + "." + dateTime.AddMonths(-i).ToString("MM");
+                    restultDay.Rows.Add(dr);
+                }
+                string jsonStr = new JsonResult(restultDay).ToJson();
+                context.Response.Write(jsonStr);
+            }
+        }
         using (IDataAccess conn = DataAccess.Create())
         {
             /**摘取自zx方法**/

wwwroot/main/Procedure/test14/demo.html

@@ -209,7 +209,8 @@
             DailypassrateDayData();
             setInterval(function () { DailypassrateDayData(); }, 180000);
             DailypassrateMonthData();
-            setInterval(function () { DailypassrateMonthData(); }, 180000);
+            setInterval(function () { DailypassrateMonthDataNew(); }, 180000);
+            setInterval(function () { DailypassrateMonthData(); }, 86400000);
             DailypassrateRepairData();
             setInterval(function () { DailypassrateRepairData(); }, 180000);
             DailypassrateSemifinishedData();
@@ -295,6 +296,41 @@
                 }
             });
         }
+        //施釉每月成品合格率(当月)
+        function DailypassrateMonthDataNew() {
+            $.get("demo.ashx?m=Dailypassratenew", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    console.log(json, '施釉每月成品合格率')
+                    // 存储施釉合格率
+                    let bjRates = window.DayZLB.data.datasets[0].data;
+                    // 存储出窑数
+                    let counts = window.DayZLB.data.datasets[1].data;
+                    // 存储日期
+                    let days = window.DayZLB.data.labels;
+                    for (let i = 0; i < json["rows"].length; i++) {
+                        let row = json["rows"][i];
+                        if (bjRates.length == 7) {
+                            bjRates.pop();
+                        }
+                        if (counts.length == 7) {
+                            counts.pop();
+                            days.pop();
+                        } 
+                        // 添加施釉合格率
+                        bjRates.push(parseFloat(row["施釉合格率"]));
+                        // 添加出窑数
+                        counts.push(parseFloat(row["出窑数"]));
+                        // 添加日期
+                        days.push(row["日期"]);
+                    }
+                    window.DayZLB.data.datasets[0].data = bjRates;
+                    window.DayZLB.data.datasets[1].data = counts;
+                    window.DayZLB.data.labels = days;
+                    window.DayZLB.update();
+                }
+            });
+        }
         //施釉每月成品合格率
         function DailypassrateMonthData() {
             $.get("demo.ashx?m=Dailypassrate&type=month&repair=false", function (data) {

wwwroot/main/Procedure/test17/rpt.ashx

@@ -217,8 +217,8 @@ SELECT
 								WHERE
 									USERCODE IN ( 'SBZ001', 'SBZ002' ) 
 								AND PROCEDUREID = 107
-								AND TRUNC( CREATETIME ) >= trunc(sysdate,'MM')
-								AND TRUNC( CREATETIME ) <= trunc(sysdate,'DD')
+								AND CREATETIME  >= trunc(sysdate,'MM')
+								AND CREATETIME  <= trunc(sysdate,'DD')
 								)
 							GROUP BY TO_CHAR(CREATETIME,'DD')
 							ORDER BY TO_CHAR(CREATETIME,'DD') 

wwwroot/main/manage/JiaShiCang/rpt.ashx

@@ -50,7 +50,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 															AND PD.PROCEDUREID IN ( 11, 104 ) 
 															AND PD.KILNID IN ( 1, 2, 5 ) 
 															AND PD.CREATETIME >= TRUNC(sysdate-7)
-															AND TRUNC(PD.CREATETIME)<=TRUNC(SYSDATE)
+															AND PD.CREATETIME<=TRUNC(SYSDATE)
 													) T
 													),
 													一车间前三缺陷数量 AS(
@@ -104,7 +104,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
 													LEFT JOIN TP_MST_DEFECT df ON df.defectid =defect.defectID
 													WHERE defect.CREATETIME>=TRUNC(sysdate-7)
-													AND TRUNC(defect.CREATETIME)<=TRUNC(SYSDATE)
+													AND defect.CREATETIME <=TRUNC(SYSDATE)
 													AND defect.VALUEFLAG=1
 													AND ((INSTR(GDD.GROUTINGLINECODE, 'B') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1) AND INSTR(GTP.GOODSTYPECODE, '001001') = 1)
 													AND gdd.VALUEFLAG=1
@@ -135,7 +135,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 													LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
 													LEFT JOIN TP_MST_DEFECT df ON df.defectid =defect.defectID
 													WHERE defect.CREATETIME>=TRUNC(sysdate-7)
-													AND TRUNC(defect.CREATETIME)<=TRUNC(SYSDATE)
+													AND defect.CREATETIME <=TRUNC(SYSDATE)
 													AND defect.VALUEFLAG=1
 													AND INSTR(GDD.GROUTINGLINECODE, 'C') = 1
 													AND gdd.VALUEFLAG=1
@@ -201,7 +201,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=GDD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
 																WHERE semicheck.CREATETIME>=TRUNC(sysdate-7)
-																AND TRUNC(semicheck.CREATETIME)<=TRUNC(SYSDATE)
+																AND semicheck.CREATETIME <=TRUNC(SYSDATE)
 																AND semicheck.VALUEFLAG=1
 																AND INSTR(GTP.GOODSTYPECODE, '001002') = 1 
 																AND gdd.VALUEFLAG=1
@@ -234,7 +234,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=GDD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
 																WHERE semicheck.CREATETIME>=TRUNC(sysdate-7)
-																AND TRUNC(semicheck.CREATETIME)<=TRUNC(SYSDATE)
+																AND semicheck.CREATETIME <=TRUNC(SYSDATE)
 																AND semicheck.VALUEFLAG=1
 																AND INSTR(GTP.GOODSTYPECODE, '001001') = 1 
 																AND gdd.VALUEFLAG=1
@@ -267,7 +267,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=GDD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
 																WHERE semicheck.CREATETIME>=TRUNC(sysdate-7)
-																AND TRUNC(semicheck.CREATETIME)<=TRUNC(SYSDATE)
+																AND semicheck.CREATETIME <=TRUNC(SYSDATE)
 																AND semicheck.VALUEFLAG=1
 																AND gdd.VALUEFLAG=1
 																AND pd.VALUEFLAG=1
@@ -281,7 +281,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																SELECT '一车间' AS 车间,  COUNT(DISTINCT PD.BARCODE )AS 检验量 FROM TP_PM_PRODUCTIONDATA PD
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=PD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
-																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(1,17)AND PD.CREATETIME>=TRUNC(sysdate-7) AND TRUNC(PD.CREATETIME)<=TRUNC(SYSDATE)
+																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(1,17)AND PD.CREATETIME>=TRUNC(sysdate-7) AND PD.CREATETIME <=TRUNC(SYSDATE)
 																  AND INSTR(GTP.GOODSTYPECODE, '001002') = 1 
 																
 																),
@@ -290,7 +290,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																SELECT '二车间' AS 车间,  COUNT(DISTINCT PD.BARCODE )AS 检验量 FROM TP_PM_PRODUCTIONDATA PD
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=PD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
-																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(1,17)AND PD.CREATETIME>=TRUNC(sysdate-7) AND TRUNC(PD.CREATETIME)<=TRUNC(SYSDATE)
+																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(1,17)AND PD.CREATETIME>=TRUNC(sysdate-7) AND PD.CREATETIME <=TRUNC(SYSDATE)
 																   AND INSTR(GTP.GOODSTYPECODE, '001001') = 1 
 																
 																
@@ -299,7 +299,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																SELECT '三车间' AS 车间, COUNT(DISTINCT PD.BARCODE )AS 检验量 FROM TP_PM_PRODUCTIONDATA PD
 																LEFT JOIN TP_MST_GOODS GOODS ON GOODS.GOODSID=PD.GOODSID
 																LEFT JOIN TP_MST_GOODSTYPE GTP ON GTP.GOODSTYPEID=GOODS.GOODSTYPEID
-																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(118,92 ,88)AND PD.CREATETIME>=TRUNC(sysdate-7) AND TRUNC(PD.CREATETIME)<=TRUNC(SYSDATE)
+																 WHERE PD.VALUEFLAG=1 AND PD.PROCEDUREID IN(118,92 ,88)AND PD.CREATETIME>=TRUNC(sysdate-7) AND PD.CREATETIME <=TRUNC(SYSDATE)
 																)
 																SELECT
 																一车间前三缺陷数量.workshops, 
@@ -1163,7 +1163,7 @@ WHERE
 		OR ( 11 NOT IN ( 11, 58 ) AND PD.VALUEFLAG = '1' AND PD.PROCEDUREID = 11 ) 
 	) 
 	AND PD.CREATETIME >= TRUNC( SYSDATE - 7 ) 
-	AND TRUNC( PD.CREATETIME ) < TRUNC( SYSDATE ) ";
+	AND  PD.CREATETIME  < TRUNC( SYSDATE ) ";
                 DataTable dt1 = conn.ExecuteDatatable(本烧出窑总数sql);
                 var 本烧出窑总数 = new List<sqlResultOne>();
                 for (int i = 0; i < dt1.Rows.Count; i++)
@@ -1220,7 +1220,7 @@ WHERE
 		OR ( 58 NOT IN ( 11, 58 ) AND PD.VALUEFLAG = '1' AND PD.PROCEDUREID = 58 ) 
 	) 
 	AND PD.CREATETIME >= TRUNC( SYSDATE - 7 ) 
-	AND TRUNC( PD.CREATETIME ) < TRUNC( SYSDATE ) ";
+	AND PD.CREATETIME  < TRUNC( SYSDATE ) ";
                 DataTable dt2 = conn.ExecuteDatatable(重烧出窑总数sql);
                 var 重烧出窑总数 = new List<sqlResultOne>();
                 for (int i = 0; i < dt2.Rows.Count; i++)
@@ -1299,7 +1299,7 @@ FROM
 		AND PD.ACCOUNTID = 1 
 		AND LENGTH( PD.KILNCARBATCHNO ) > 0 
 		AND PD.CREATETIME >= TRUNC( SYSDATE - 7 ) 
-		AND TRUNC( PD.CREATETIME ) < TRUNC( SYSDATE ) 
+		AND  PD.CREATETIME  < TRUNC( SYSDATE ) 
 		AND PD.MODELTYPE IN ( - 1, - 4, - 5 ) 
 		AND PD.CHECKBATCHNO = 1 
 		AND ( ( 11 <> 58 AND PD.ISREFIRE = '0' ) OR ( 11 = 58 AND PD.ISREFIRE = '6' ) ) 
@@ -1384,7 +1384,7 @@ FROM
 		AND PD.ACCOUNTID = 1 
 		AND LENGTH( PD.KILNCARBATCHNO ) > 0 
 		AND PD.CREATETIME >= TRUNC( SYSDATE - 7 ) 
-		AND TRUNC( PD.CREATETIME ) < TRUNC( SYSDATE ) 
+		AND  PD.CREATETIME  < TRUNC( SYSDATE ) 
 		AND PD.MODELTYPE IN ( - 1, - 4, - 5 ) 
 		AND PD.CHECKBATCHNO = 1 
 		AND ( ( 58 <> 58 AND PD.ISREFIRE = '0' ) OR ( 58 = 58 AND PD.ISREFIRE = '6' ) ) 
@@ -1479,7 +1479,7 @@ FROM
 												INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 												WHERE GDD.VALUEFLAG = 1 
 												AND GDD.CREATETIME >= TRUNC( sysdate - 7 )
-												AND TRUNC( GDD.CREATETIME ) < TRUNC( SYSDATE )
+												AND GDD.CREATETIME  < TRUNC( SYSDATE )
 											) ) AS SMALLGDD,
 											--成型大件
 											MAX( (
@@ -1490,7 +1490,7 @@ FROM
 												INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 												WHERE GDD.VALUEFLAG = 1 
 												AND GDD.CREATETIME >= TRUNC( sysdate - 7 )
-												AND TRUNC( GDD.CREATETIME ) < TRUNC( SYSDATE )
+												AND  GDD.CREATETIME < TRUNC( SYSDATE )
 												AND SUBSTR(GDD.GROUTINGLINECODE, 0, 4) NOT IN ('C05B','C05C')
 											) ) AS BIGGDD,
 											--半检小件
@@ -1518,7 +1518,7 @@ FROM
 												INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 												WHERE F.VALUEFLAG = 1 
 												AND F.CREATETIME >= TRUNC( sysdate - 7 )
-												AND TRUNC( F.CREATETIME ) < TRUNC( SYSDATE )
+												AND  F.CREATETIME  < TRUNC( SYSDATE )
 											) ) AS SMALLPACK,
 											MAX( (
 												SELECT 
@@ -1528,7 +1528,7 @@ FROM
 												INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 												WHERE F.VALUEFLAG = 1 
 												AND F.CREATETIME >= TRUNC( sysdate - 7 )
-												AND TRUNC( F.CREATETIME ) < TRUNC( SYSDATE )
+												AND  F.CREATETIME  < TRUNC( SYSDATE )
 											) ) AS BIGPACK
 										FROM
 											TP_PM_PRODUCTIONDATA PD
@@ -1537,7 +1537,7 @@ FROM
 										WHERE
 											PD.VALUEFLAG = 1
 										AND PD.CREATETIME >= TRUNC( sysdate - 7 )
-										AND TRUNC( PD.CREATETIME ) < TRUNC( SYSDATE )
+										AND  PD.CREATETIME  < TRUNC( SYSDATE )
 										
 										
 										";
@@ -1931,7 +1931,7 @@ ORDER BY DECODE(NVL(成检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(成检废品
                             VALUEFLAG
                           FROM TP_PM_FQCITEMSDATA
                           WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-                        AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) = TRUNC(SYSDATE)
+                        AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE)
                         AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
                         AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
                           GROUP BY 
@@ -1943,14 +1943,13 @@ ORDER BY DECODE(NVL(成检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(成检废品
                             INSPECTITEM
                           FROM TP_PM_FQCITEMSDATA
                           WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-                        AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) = TRUNC(SYSDATE)
+                        AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE)
                         AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647) 
                           GROUP BY 
                             INSPECTITEM
                         ) SUM2 ON SUM2.INSPECTITEM = TP_PM_FQCITEMSDATA.INSPECTITEM
                       WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-                      AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) 
-											 = TRUNC(SYSDATE)
+                      AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE)
                       AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
                       AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0
                       GROUP BY