高压看板时间分为大于当天6点取当天6点到第二天6点否则取前一天6点到今天6点

wwwroot/main/Procedure/testHighPressure/HighPressureKanban.ashx

@@ -27,7 +27,6 @@ public class SmallKanban : IHttpHandler
             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)
@@ -36,12 +35,32 @@ public class SmallKanban : IHttpHandler
             }
             if (context.Request["m"].ToString() == "ReadAll")
             {
-                string time = DateTime.Now.ToString("yyyy-MM-dd");
+                DateTime time = new DateTime(2024, 10, 27, 5, 0, 0);
+                //起始时间
+                string StartTime = string.Empty;
+                //结束时间
+                string EndTime = string.Empty;
+                //注浆时间
+                string zujiangTime= string.Empty;
+                if (time >= new DateTime(time.Year, time.Month, time.Day, 6, 0, 0))
+                {
+                    StartTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    EndTime = new DateTime(time.Year, time.Month, time.Day+1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    zujiangTime = time.ToString("yyyy-MM-dd");
+                }
+                else
+                {
+                    StartTime = new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    EndTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    zujiangTime = time.AddDays(-1).ToString("yyyy-MM-dd");
+                }
                 //查询注浆  
                 DataTable dt = conn.ExecuteDatatable("SELECT B.GOODSCODE, B.USERCODE, B.GROUTINGFLAG, B.SCRAPFLAG  FROM " +
                     " TP_PM_GROUTINGCHECK A  LEFT JOIN TP_PM_GROUTINGDAILYDETAIL B  ON A. GROUTINGDAILYDETAILID =B.GROUTINGDAILYDETAILID " +
-                    " WHERE B.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' )  AND B.USERCODE IN ( 'C25', 'C89' )  AND ( B.GROUTINGDATE >= TO_DATE( '" + time + "', 'YYYY-MM-DD' )" +
-                    " AND B.GROUTINGFLAG = '1' AND A.CREATETIME  >= TO_DATE( '" + time + "', 'YYYY-MM-DD' )  ) ");
+                    " WHERE B.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' )  AND B.USERCODE IN ( 'C25', 'C89' )  AND ( " +
+                    " B.GROUTINGDATE >= TO_DATE( '" + zujiangTime + "', 'YYYY-MM-DD' )  AND B.GROUTINGFLAG = '1' " +
+                    " AND A.CREATETIME  >= TO_TIMESTAMP( '" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS' ) " +
+                    " AND A.CREATETIME  <= TO_TIMESTAMP( '" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS' ) ) ");
                 //   //查询注浆 (外加 当天损坯数)
                 //   DataTable dt = conn.ExecuteDatatable(@"SELECT GOODSCODE,USERCODE,GROUTINGFLAG,SCRAPFLAG 
                 //   FROM TP_PM_GROUTINGDAILYDETAIL  WHERE GOODSCODE IN( 'H01412M-G','H0972M-G') AND USERCODE IN('C25','C89' ) 
@@ -52,26 +71,47 @@ public class SmallKanban : IHttpHandler
                     " COUNT(DISTINCT CASE WHEN B.PROCEDUREID = 56 and B.CREATEUSERID IN (227,427)  THEN B.BARCODE ELSE NULL END) AS 返修数 " +
                     " FROM ( SELECT DISTINCT PROCEDUREID, GOODSCODE, GROUTINGUSERCODE,BARCODE " +
                     " FROM TP_PM_PRODUCTIONDATA  WHERE PROCEDUREID = 31  AND GOODSCODE IN ( 'H01412M-G', 'H0972M-G' )" +
-                    " AND GROUTINGUSERCODE IN ( 'C89', 'C25' ) AND VALUEFLAG = '1' AND CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD')) A " +
-                    " LEFT JOIN TP_PM_PRODUCTIONDATA B ON A.BARCODE = B.BARCODE WHERE B.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') " +
+                    " AND GROUTINGUSERCODE IN ( 'C89', 'C25' ) AND VALUEFLAG = '1' AND " +
+                    " CREATETIME >= TO_TIMESTAMP('" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS') AND " +
+                    " CREATETIME <= TO_TIMESTAMP('" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS')) A " +
+                    " LEFT JOIN TP_PM_PRODUCTIONDATA B ON A.BARCODE = B.BARCODE " +
+                    " WHERE B.CREATETIME >= TO_TIMESTAMP('" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS') AND " +
+                    " B.CREATETIME <= TO_TIMESTAMP('" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS')" +
                     " AND B.VALUEFLAG = '1' GROUP BY A.GOODSCODE, A.GROUTINGUSERCODE");
                 //查询半检不合格数
                 DataTable dbt = conn.ExecuteDatatable("SELECT GOODSCODE,GROUTINGUSERCODE FROM TP_PM_SCRAPPRODUCT " +
                     " WHERE GOODSCODE IN('H01412M-G','H0972M-G' )" +
                     " AND GROUTINGUSERCODE IN( 'C25','C89' )  AND " +
                     " RREASON IN('卡球','裂','偏薄','针孔','变形','不平','成型报损','杂质','打孔不标准','湿坯补土','干土','裂角','安装不标准','堵孔','气泡')" +
-                    " AND VALUEFLAG='1' AND UPDATETIME >=  TO_DATE('" + time + "', 'YYYY-MM-DD')");
+                    " AND VALUEFLAG='1' AND UPDATETIME >=  TO_TIMESTAMP('" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS') AND UPDATETIME <=  TO_TIMESTAMP('" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS')");
                 //查询成检 交接数量 和次品数
-                DataTable xbt = conn.ExecuteDatatable("SELECT B.GOODSCODE, B.GROUTINGUSERCODE, B.PROCEDUREID,COUNT( DISTINCT A.BARCODE ) 交接数," +
-                    "COUNT( DISTINCT CASE WHEN A.GOODSLEVELTYPEID = 7 THEN A.BARCODE ELSE NULL END ) 次品数 " +
-                    " FROM TP_PM_PRODUCTIONDATA B INNER JOIN TP_PM_PRODUCTIONDATA A ON A.BARCODE = B.BARCODE " +
-                    "AND A.PROCEDUREID = 10 WHERE A.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' ) AND A.GROUTINGUSERCODE IN ( 'C25', 'C89' ) AND B.PROCEDUREID = 9 " +
-                    "AND A.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND B.CREATETIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') " +
-                    "AND A.VALUEFLAG = 1 GROUP BY B.GOODSCODE,B.GROUTINGUSERCODE,B.PROCEDUREID");
+                DataTable xbt = conn.ExecuteDatatable(" SELECT "+
+                        " B.GOODSCODE, "+
+                        " B.GROUTINGUSERCODE, "+
+                        " B.PROCEDUREID, "+
+                        " COUNT( DISTINCT A.BARCODE ) 交接数,  "+
+                        " COUNT( DISTINCT CASE WHEN A.GOODSLEVELTYPEID = 7 THEN A.BARCODE ELSE NULL END ) 次品数  "+
+                    " FROM "+
+                        " TP_PM_PRODUCTIONDATA B "+
+                        " INNER JOIN TP_PM_PRODUCTIONDATA A ON A.BARCODE = B.BARCODE   "+
+                        " AND A.PROCEDUREID = 10 "+
+                    " WHERE "+
+                        " A.GOODSCODE IN ( 'H01412M-G', 'H0972M-G' ) "+
+                        " AND A.GROUTINGUSERCODE IN ( 'C25', 'C89' ) "+
+                        " AND B.PROCEDUREID = 9  "+
+                        " AND A.CREATETIME >= TO_TIMESTAMP( '" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS' ) "+
+                        " AND A.CREATETIME <= TO_TIMESTAMP( '" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS' ) "+
+                        " AND B.CREATETIME >= TO_TIMESTAMP( '" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS' )  "+
+                        " AND B.CREATETIME <= TO_TIMESTAMP( '" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS' )  "+
+                        " AND A.VALUEFLAG = 1 "+
+                    " GROUP BY "+
+                        " B.GOODSCODE,"+
+                        " B.GROUTINGUSERCODE,"+
+                        " B.PROCEDUREID");
                 //查询注浆当天损坯数
                 DataTable ldt = conn.ExecuteDatatable("SELECT GOODSCODE,USERCODE,GROUTINGFLAG,SCRAPFLAG " +
                     " FROM TP_PM_GROUTINGDAILYDETAIL  WHERE GOODSCODE IN( 'H01412M-G','H0972M-G') AND USERCODE IN('C25','C89' )" +
-                    " AND  SCRAPTIME >= TO_DATE('" + time + "', 'YYYY-MM-DD') AND SCRAPFLAG='1' ");
+                    " AND  SCRAPTIME >= TO_TIMESTAMP('" + StartTime + "', 'YYYY-MM-DD HH24:MI:SS')  AND  SCRAPTIME >= TO_TIMESTAMP('" + EndTime + "', 'YYYY-MM-DD HH24:MI:SS') AND SCRAPFLAG='1' ");
 
                 //定义返回表
                 DataTable result = new DataTable();