20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime

wwwroot/mes/rpt/readme.txt

@@ -1,2 +1,25 @@
-rpt101 成型月度结算表
-
+2025/10/24 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更如下：
+一、需要变更的报表：
+1、卫生陶瓷陷欠点表
+2、成品质量分析汇总表（此表包括冷修、重烧质量分析表）
+3、个人质量分析日报表（回烧修补工）
+4、成品质量分析日报表（成型工序）
+5、成品质量分析日报表（半检工序）
+6、成品质量分析日报表（打磨工序）
+7、成品质量分析日报表（刷洗工序）
+8、成品质量分析日报表（施釉工序）
+9、成品质量分析日报表（擦坯工）
+10、成品质量分析日报表（装窑工序）
+11、成品质量分析日报表（烧窑工序）
+12、成品质量分析日报表（出窑工序）
+13、成品质量分析日报表（原料工序）
+14、注浆工个人质量分析报表（成型车间）
+15、打磨工个人质量分析报表（精修车间）
+16、刷洗工个人质量分析报表（精修车间）
+17、半检工个人质量分析报表（半检车间）
+18、施釉工个人质量分析报表（施釉车间）
+19、擦坯工个人质量分析报表（施釉车间）
+20、装窑工个人质量分析报表（烧成车间）
+21、烧窑工个人质量分析报表（烧成车间）
+22、出窑工个人质量分析报表（烧成车间）
+23、生产日进度表

wwwroot/mes/rpt/rpt102/rpt.ashx

@@ -92,11 +92,9 @@ FROM(
                                                                AND pd28.valueflag = 1
                                                                AND pd24.valueflag = 1
                                                                AND pd24.procedureid IN  (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42   
-                                                                -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                                               AND pd28.createtime >= @DATETIME@
-                                                               AND pd28.createtime <  @dateEnd@                                
-                                                              -- AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
-                                                              -- AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                                                -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更  createtime - > checktime
+                                                               AND pd28.checktime >= @DATETIME@
+                                                               AND pd28.checktime <  @dateEnd@                                 
                                                                AND pd24.productiondataid < pd28.productiondataid) t
                                                      WHERE rownums = 1
                                                        AND t.procedureid in (55, 13 )) pd
@@ -190,14 +188,13 @@ FROM(
                                                                          WHERE pd28.procedureid = 16
                                                                            AND pd28.valueflag = 1
                                                                            AND pd24.valueflag = 1
-                                                                           AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                                           AND pd28.createtime >=
+                                                                           AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42   
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                                           AND pd28.checktime >=
                                                                                (add_months(trunc(SYSDATE, 'MM'), -1) + 25)
-                                                                           AND pd28.createtime <
+                                                                           AND pd28.checktime <
                                                                                (add_months(trunc(SYSDATE, 'MM'), 0) + 24) + 23 / 24 +
-                                                                               59 / (24 * 60) + 59 / (24 * 60 * 60)
-                                                                              --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
-                                                                              --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                                                               59 / (24 * 60) + 59 / (24 * 60 * 60) 
                                                                            AND pd24.productiondataid < pd28.productiondataid) t
                                                                  WHERE rownums = 1
                                                                    AND t.procedureid in (55, 13 )) pd
@@ -322,11 +319,12 @@ FROM(
                                                    AND pd28.valueflag = 1
                                                    AND pd24.valueflag = 1
                                                    AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                   AND pd28.createtime >=
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                   AND pd28.checktime >=
                                                        to_date((extract(YEAR FROM SYSDATE) - 1) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
-                                                   AND pd28.createtime <
+                                                   AND pd28.checktime <
                                                        to_date((extract(YEAR FROM SYSDATE)) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
@@ -412,9 +410,10 @@ FROM(
                                                         AND pd28.valueflag = 1
                                                         AND pd24.valueflag = 1
                                                         AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                          AND pd28.createtime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                          AND pd28.checktime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
                                                                 ,'yyyy-mm-dd hh24:mi:ss')
-                                                          AND pd28.createtime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
+                                                          AND pd28.checktime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
                                                                ,'yyyy-mm-dd hh24:mi:ss')                               
                                                         --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                         --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -447,7 +446,7 @@ FROM(
 
                 }
                 else if (procedure == "回烧")
-                {                 
+                {
                     sqlStr = @"SELECT
 *
 FROM(
@@ -502,10 +501,10 @@ FROM(
                                                              WHERE pd28.procedureid = 28
                                                                AND pd28.valueflag = 1
                                                                AND pd24.valueflag = 1
-                                                               AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42   
-                                                                -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                                               AND pd28.createtime >= @DATETIME@
-                                                               AND pd28.createtime <  @dateEnd@                                
+                                                               AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42    
+                                                                 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                               AND pd28.checktime >= @DATETIME@
+                                                               AND pd28.checktime <  @dateEnd@                                
                                                               -- AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                               -- AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
                                                                AND pd24.productiondataid < pd28.productiondataid) t
@@ -600,10 +599,11 @@ FROM(
                                                                          WHERE pd28.procedureid = 28
                                                                            AND pd28.valueflag = 1
                                                                            AND pd24.valueflag = 1
-                                                                           AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                                           AND pd28.createtime >=
+                                                                           AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42    
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                                           AND pd28.checktime >=
                                                                                (add_months(trunc(SYSDATE, 'MM'), -1) + 25)
-                                                                           AND pd28.createtime <
+                                                                           AND pd28.checktime <
                                                                                (add_months(trunc(SYSDATE, 'MM'), 0) + 24) + 23 / 24 +
                                                                                59 / (24 * 60) + 59 / (24 * 60 * 60)
                                                                               --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
@@ -732,12 +732,13 @@ FROM
                                                  WHERE pd28.procedureid = 28
                                                    AND pd28.valueflag = 1
                                                    AND pd24.valueflag = 1
-                                                   AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                   AND pd28.createtime >=
+                                                   AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                   AND pd28.checktime >=
                                                        to_date((extract(YEAR FROM SYSDATE) - 1) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
-                                                   AND pd28.createtime <
+                                                   AND pd28.checktime <
                                                        to_date((extract(YEAR FROM SYSDATE)) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
@@ -822,9 +823,10 @@ union ALL
                                                         AND pd28.valueflag = 1
                                                         AND pd24.valueflag = 1
                                                         AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                          AND pd28.createtime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                          AND pd28.checktime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
                                                                 ,'yyyy-mm-dd hh24:mi:ss')
-                                                          AND pd28.createtime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
+                                                          AND pd28.checktime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
                                                                ,'yyyy-mm-dd hh24:mi:ss')                               
                                                         --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                         --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -855,7 +857,7 @@ union ALL
 ) ORDER BY DECODE(窑炉, '日合计', 1, '月度累计', 2),窑炉  ".Replace("{first}",first).Replace("{second}",second);
                 }
                 else if (procedure == "冷修") {
-                   
+
 
                     sqlStr = @"SELECT
 *
@@ -912,9 +914,9 @@ FROM(
                                                                 AND pd28.valueflag = 1
                                                                 AND pd24.valueflag = 1
                                                                 AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                                 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                                               AND pd28.createtime >= @DATETIME@
-                                                               AND pd28.createtime <  @dateEnd@                             
+                                                                 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 
+                                                               AND pd28.checktime >= @DATETIME@
+                                                               AND pd28.checktime <  @dateEnd@                             
                                                                 AND pd24.productiondataid < pd28.productiondataid) t
                                                       WHERE rownums = 1
                                                         AND t.procedureid = 42) pd
@@ -995,9 +997,10 @@ FROM(
                                                                            AND pd28.valueflag = 1
                                                                            AND pd24.valueflag = 1
                                                                            AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                                           AND pd28.createtime >=
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                                           AND pd28.checktime >=
                                                                                (add_months(trunc(SYSDATE, 'MM'), -1) + 25)
-                                                                           AND pd28.createtime <
+                                                                           AND pd28.checktime <
                                                                                (add_months(trunc(SYSDATE, 'MM'), 0) + 24) + 23 / 24 +
                                                                                59 / (24 * 60) + 59 / (24 * 60 * 60)
                                                                               --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
@@ -1125,12 +1128,13 @@ FROM
                                                  WHERE pd28.procedureid = 28
                                                    AND pd28.valueflag = 1
                                                    AND pd24.valueflag = 1
-                                                   AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                   AND pd28.createtime >=
+                                                   AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42    
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                   AND pd28.checktime >=
                                                        to_date((extract(YEAR FROM SYSDATE) - 1) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
-                                                   AND pd28.createtime <
+                                                   AND pd28.checktime <
                                                        to_date((extract(YEAR FROM SYSDATE)) ||
                                                                '12-26 00:00:00'
                                                               ,'yyyy-mm-dd hh24:mi:ss')
@@ -1214,10 +1218,11 @@ union ALL
                                                       WHERE pd28.procedureid = 28
                                                         AND pd28.valueflag = 1
                                                         AND pd24.valueflag = 1
-                                                        AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
-                                                          AND pd28.createtime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
+                                                        AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42    
+ -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
+                                                          AND pd28.checktime >= to_date((extract(YEAR FROM SYSDATE) - 1) || '12-26 00:00:00'
                                                                 ,'yyyy-mm-dd hh24:mi:ss')
-                                                          AND pd28.createtime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
+                                                          AND pd28.checktime <  to_date((extract(YEAR FROM SYSDATE)) || '12-26 00:00:00'
                                                                ,'yyyy-mm-dd hh24:mi:ss')                               
                                                         --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                         --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -1312,8 +1317,8 @@ COUNT( DISTINCT productiondataid ) 出窑量,
                                    AND pd24.valueflag = 1
                                    AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
                                       -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                   AND pd28.createtime >= @DATETIME@ 
-                                   AND pd28.createtime <=  @dateEnd@ 
+                                   AND pd28.checktime >= @DATETIME@ 
+                                   AND pd28.checktime <=  @dateEnd@ 
                                      --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                      --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
                                    AND pd24.productiondataid < pd28.productiondataid) t
@@ -1401,8 +1406,8 @@ COUNT( DISTINCT productiondataid ) 出窑量,
                                                                 AND pd24.valueflag = 1
                                                                 AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
                                                                   -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                                               AND pd28.createtime >= @DATETIME@
-                                                               AND pd28.createtime <  @dateEnd@                                
+                                                               AND pd28.checktime >= @DATETIME@
+                                                               AND pd28.checktime <  @dateEnd@                                
                                                                 --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                                 --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
                                                                 AND pd24.productiondataid < pd28.productiondataid) t
@@ -1486,8 +1491,8 @@ COUNT( DISTINCT productiondataid ) 出窑量,
                                                         AND pd24.valueflag = 1
                                                         AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42     
                                                        -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更
-                                                               AND pd28.createtime >= @DATETIME@
-                                                               AND pd28.createtime <  @dateEnd@                           
+                                                               AND pd28.checktime >= @DATETIME@
+                                                               AND pd28.checktime <  @dateEnd@                           
                                                         --AND pd28.createtime >= to_date('2025-04-17', 'yyyy-MM-DD')
                                                         --AND pd28.createtime < to_date('2025-04-20 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
                                                         AND pd24.productiondataid < pd28.productiondataid) t
@@ -1526,7 +1531,7 @@ COUNT( DISTINCT productiondataid ) 出窑量,
             //sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
             //获取分页参数
             int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-            int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+            int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
             string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
             string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 
@@ -1534,7 +1539,10 @@ COUNT( DISTINCT productiondataid ) 出窑量,
             int total = 0;
             DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
             /*删除列（通过列名称）*/
-            dt.Columns.Remove("ROWNO");
+            if (dt != null && dt.Rows.Count > 0)
+            {
+                dt.Columns.Remove("ROWNO");
+            }           
 
             string jsonStr = new JsonResult(dt) { total = total }.ToJson();
             context.Response.Write(jsonStr);

wwwroot/mes/rpt/rpt202/rpt.ashx

@@ -329,7 +329,7 @@ union ALL
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -331,7 +331,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -329,7 +329,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -327,7 +327,7 @@ group by substr(gtp.goodstypecode, 0, 6)
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt206/rpt.ashx

@@ -330,7 +330,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -336,7 +336,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
                 string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt208/rpt.ashx

@@ -341,7 +341,7 @@ union ALL
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
                 string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt209/rpt.ashx

@@ -338,7 +338,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
                 string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt210/rpt.ashx

@@ -78,8 +78,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                 WHERE
 	                                PD.PROCEDUREID IN ( 16) 
 -- 20251027 web报表中以末次质量登记时间 CREATETIME 节点统计质量数据调整为首次质量登记时间做统计质量数据变更  createtime  checktime
-	                                AND PD.createtime >= @DATEBEGIN@
-                                    AND PD.createtime < @DATEEND@ 
+	                                AND PD.checktime >= @DATEBEGIN@
+                                    AND PD.checktime < @DATEEND@ 
 	                                
 	                                AND PD.VALUEFLAG = 1
                                 GROUP BY
@@ -129,8 +129,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 									WHERE
 	                                PD.PROCEDUREID =16
 -- 20251027 web报表中以末次质量登记时间 CREATETIME 节点统计质量数据调整为首次质量登记时间做统计质量数据变更  checktime 
-	                                AND PD.createtime >= @DATEBEGIN@
-                                    AND PD.createtime < @DATEEND@ 
+	                                AND PD.checktime >= @DATEBEGIN@
+                                    AND PD.checktime < @DATEEND@ 
 	                                -- AND DF.PROCEDUREID NOT IN(61,28)
 	                                AND PD.VALUEFLAG = 1 
 UNION ALL
@@ -175,8 +175,8 @@ UNION ALL
 									WHERE
 	                                PD.PROCEDUREID =16
 -- 20251027 web报表中以末次质量登记时间 CREATETIME 节点统计质量数据调整为首次质量登记时间做统计质量数据变更  createtime  checktime
-	                                AND PD.createtime >= @DATEBEGIN@
-                                    AND PD.createtime < @DATEEND@ 
+	                                AND PD.checktime >= @DATEBEGIN@
+                                    AND PD.checktime < @DATEEND@ 
 	                                -- AND DF.PROCEDUREID NOT IN(61,28)
 	                                AND PD.VALUEFLAG = 1
                                  group by substr(gtp.goodstypecode, 0, 6) 

wwwroot/mes/rpt/rpt212/rpt.ashx

@@ -124,8 +124,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
                                             AND pd28.checktime < @DATEEND@  
-                                                                            -- AND pd28.createtime >= @DATEBEGIN@ -- to_date('2025-03-26', 'yyyy-MM-DD')
-                                                                        --   AND pd28.createtime <= @DATEEND@  -- to_date('2025-04-25 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                                                           
                                                                          AND pd24.productiondataid < pd28.productiondataid) t
                                                                WHERE rownums = 1
                                                                  AND t.procedureid IN (4, 36, 53)) pd
@@ -228,7 +227,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlPara.Add(new CDAParameter("GROUTINGLINECODE", context.Request["GROUTINGLINECODE"], DataType.NVarChar));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt213/rpt.ashx

@@ -122,9 +122,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																		 AND pd24.procedureid IN (42, 5,36,52) --  重烧质量登记里包含  
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@  
-																	--	 AND pd28.createtime >=  @DATEBEGIN@ -- to_date('2025-06-02', 'yyyy-MM-DD')
-																	--	 AND pd28.createtime <=  @DATEEND@ -- to_date('2025-06-02 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@   
 																		 AND pd24.productiondataid < pd28.productiondataid) t
 															   WHERE rownums = 1
 																 AND t.procedureid IN (5,36,52)) pd
@@ -228,7 +226,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				sqlPara.Add(new CDAParameter("GROUTINGLINECODE", context.Request["GROUTINGLINECODE"], DataType.NVarChar));
 				//获取分页参数
 				int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-				int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+				int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
 				string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
 				string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt214/rpt.ashx

@@ -108,9 +108,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                              AND pd24.procedureid IN (42, 40, 6, 31) --  重烧质量登记里包含   
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@                                          
-                                                             -- AND pd28.createtime >= to_date('2025-04-03', 'yyyy-MM-DD')
-                                                             -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@                                           
                                                              AND pd24.productiondataid < pd28.productiondataid) t
                                                    WHERE rownums = 1 AND t.procedureid in  (40, 6, 31) ) PD
                                             LEFT JOIN tp_pm_productiondata pd61 -- 重烧质量检测  功能检测

wwwroot/mes/rpt/rpt215/rpt.ashx

@@ -137,8 +137,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                              AND pd24.procedureid IN (24, 10, 37, 41) --  质量登记里包含                                 
                                                               -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@  
-                                                                 -- to_date('2025-06-02 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@   
                                                              AND pd24.productiondataid < pd28.productiondataid) t
                                                    WHERE rownums = 1
                                                      AND t.procedureid IN (10, 37, 41)) pd

wwwroot/mes/rpt/rpt216/rpt.ashx

@@ -263,7 +263,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				//获取分页数据    
 				int total = 0;
 				DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-				d.Columns.Remove("GID");//移除GID列
+                if (d != null && d.Rows.Count > 1) {
+                    d.Columns.Remove("GID");//移除GID列
+                } 
 				string jsonStr = new JsonResult(d) { total = total }.ToJson();
 				context.Response.Write(jsonStr);
 			}

wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -123,9 +123,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                      AND pd24.procedureid IN (42,"+ProceduraID+@")  --  重烧质量登记里包含  5-7重烧登窑  25
                                                       -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@                                       
-                                                     -- AND pd28.createtime >= to_date('2025-04-03', 'yyyy-MM-DD')
-                                                     -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@   
                                                      AND pd24.productiondataid < pd28.productiondataid) t
                                            WHERE rownums = 1 AND t.procedureid in ( "+ProceduraID+@") ) PD
                                             LEFT JOIN tp_pm_productiondata pd61 -- 重烧质量检测  功能检测

wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -124,9 +124,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                              AND pd24.procedureid IN (42,"+proceduareID+@") --  重烧质量登记里包含  5-8重烧烧窑     
                                                               -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@                                         
-                                                             -- AND pd28.createtime >= to_date('2025-04-03', 'yyyy-MM-DD')
-                                                             -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@                                          
                                                              AND pd24.productiondataid < pd28.productiondataid) t
                                                    WHERE rownums = 1 AND t.procedureid in  ("+proceduareID+@") ) PD
                                             LEFT JOIN tp_pm_productiondata pd61 -- 重烧质量检测  功能检测

wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -123,9 +123,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                          AND pd24.procedureid IN  (42,"+proceduareID+@")  --  重烧质量登记里包含  5-9重烧卸窑   
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@                                   
-                                                         --AND pd28.createtime >= to_date('2025-04-03', 'yyyy-MM-DD')
-                                                         --AND pd28.createtime <  to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@                                    
                                                          AND pd24.productiondataid < pd28.productiondataid) t
                                                WHERE rownums = 1 AND t.procedureid in (  "+proceduareID+@") ) PD
                                                 LEFT JOIN tp_pm_productiondata pd61 -- 重烧质量检测 功能检测

wwwroot/mes/rpt/rpt226/rpt.ashx

@@ -122,9 +122,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
                                             AND pd28.checktime >= @DATEBEGIN@
-                                            AND pd28.checktime < @DATEEND@  
-                                              -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
-                                              -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
+                                            AND pd28.checktime < @DATEEND@   
                                                AND pd24.productiondataid < pd28.productiondataid) t
                                      WHERE rownums = 1
                                        AND t.procedureid = 24) pd
@@ -465,7 +463,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
                 string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 

wwwroot/mes/rpt/rpt304/rpt.ashx

@@ -78,8 +78,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																   AND PD24.VALUEFLAG = 1
 																   AND PD24.PROCEDUREID IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-																  AND PD28.createtime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
-																   AND PD28.createtime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+																  AND PD28.checktime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+																   AND PD28.checktime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
 																   AND ('"+userCode+@"' IS NULL OR '"+userCode+@"' = '' OR
 																	   INSTR(PD28.GROUTINGUSERCODE, '"+userCode+@"') > 0)
 																   AND PD24.PRODUCTIONDATAID < PD28.PRODUCTIONDATAID) T
@@ -152,8 +152,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																   AND PD24.VALUEFLAG = 1
 																   AND PD24.PROCEDUREID IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42  
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-															AND PD28.createtime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
-															 AND PD28.createtime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+															AND PD28.checktime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+															 AND PD28.checktime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
 																   AND ('"+userCode+@"' IS NULL OR '"+userCode+@"' = '' OR
 																	   INSTR(PD28.GROUTINGUSERCODE, '"+userCode+@"') > 0)
 																   AND PD24.PRODUCTIONDATAID < PD28.PRODUCTIONDATAID) T
@@ -225,8 +225,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 																   AND PD24.VALUEFLAG = 1
 																   AND PD24.PROCEDUREID IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42  
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-															AND PD28.createtime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
-															 AND PD28.createtime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+															AND PD28.checktime >= to_date('" + dateBegin.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
+															 AND PD28.checktime <= to_date('" + dateEnd.ToString("yyyy-MM-dd HH:mm:ss") + @"','yyyy-mm-dd hh24:mi:ss') 
 																   AND ('"+userCode+@"' IS NULL OR '"+userCode+@"' = '' OR
 																	   INSTR(PD28.GROUTINGUSERCODE, '"+userCode+@"') > 0)
 																   AND PD24.PRODUCTIONDATAID < PD28.PRODUCTIONDATAID) T
@@ -549,8 +549,8 @@ AND DF.PROCEDUREID NOT IN " + notInproc;
 																		 AND pd24.valueflag = 1
 																		 AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime  
-																		 AND pd28.createtime >= @DATEBEGIN@
-																		 AND pd28.createtime <=   @DATEEND@ 
+																		 AND pd28.checktime >= @DATEBEGIN@
+																		 AND pd28.checktime <=   @DATEEND@ 
 																		 AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )                                                 
 																		 AND pd24.productiondataid < pd28.productiondataid) t
 															   WHERE rownums = 1
@@ -616,8 +616,8 @@ AND DF.PROCEDUREID NOT IN " + notInproc;
 																		 AND pd24.valueflag = 1
 																		 AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime  
-																		 AND pd28.createtime >= @DATEBEGIN@
-																		 AND pd28.createtime <=   @DATEEND@ 
+																		 AND pd28.checktime >= @DATEBEGIN@
+																		 AND pd28.checktime <=   @DATEEND@ 
 																		 AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )                                                 
 																		 AND pd24.productiondataid < pd28.productiondataid) t
 															   WHERE rownums = 1
@@ -1429,8 +1429,8 @@ SELECT
 																		 AND pd24.valueflag = 1
 																		 AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-																		 AND pd28.createtime >= @DATEBEGIN@
-																		 AND pd28.createtime <=   @DATEEND@ 
+																		 AND pd28.checktime >= @DATEBEGIN@
+																		 AND pd28.checktime <=   @DATEEND@ 
 																		 AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )                                                 
 																		 AND pd24.productiondataid < pd28.productiondataid) t
 															   WHERE rownums = 1
@@ -1497,8 +1497,8 @@ SELECT
 																		 AND pd24.valueflag = 1
 																		 AND pd24.procedureid IN (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-																		 AND pd28.createtime >= @DATEBEGIN@
-																		 AND pd28.createtime <=   @DATEEND@ 
+																		 AND pd28.checktime >= @DATEBEGIN@
+																		 AND pd28.checktime <=   @DATEEND@ 
 																		 AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )                                                 
 																		 AND pd24.productiondataid < pd28.productiondataid) t
 															   WHERE rownums = 1
@@ -2291,8 +2291,8 @@ SELECT distinct
                                              AND pd24.valueflag = 1
                                              AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-                                             AND pd28.createtime >= @DATEBEGIN@
-                                             AND pd28.createtime <=   @DATEEND@ 
+                                             AND pd28.checktime >= @DATEBEGIN@
+                                             AND pd28.checktime <=   @DATEEND@ 
                                              AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )                                                 
                                              AND pd24.productiondataid < pd28.productiondataid) t
                                    WHERE rownums = 1
@@ -2360,8 +2360,8 @@ SELECT distinct
 														 AND pd24.valueflag = 1
 														 AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42 
 -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime 
-														 AND pd28.createtime >= @DATEBEGIN@
-														 AND pd28.createtime <=   @DATEEND@ 
+														 AND pd28.checktime >= @DATEBEGIN@
+														 AND pd28.checktime <=   @DATEEND@ 
 														 AND (@USERCODE@ is null or @USERCODE@ = '' or instr( pd28.GROUTINGUSERCODE,@USERCODE@) > 0 )
 														 AND pd24.productiondataid < pd28.productiondataid) t
 											   WHERE rownums = 1

wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -134,8 +134,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     AND pd24.valueflag = 1
                                                                     AND pd24.procedureid IN  (55, 13, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                                     AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                                         -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                                         -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -223,8 +223,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     AND pd24.valueflag = 1
                                                                     AND pd24.procedureid IN  (42, 55, 13) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                                     AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                                         -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                                         -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -453,8 +453,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     AND pd24.valueflag = 1
                                                                     AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                                     AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                                         -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                                         -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -541,8 +541,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     AND pd24.valueflag = 1
                                                                     AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                                     AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                                         -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                                         -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -771,8 +771,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                            AND pd24.valueflag = 1
                                                            AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                            AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                               -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                               -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
@@ -860,8 +860,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                     AND pd24.valueflag = 1
                                                                     AND pd24.procedureid IN (24, 42) --  重烧质量登记里包含 重烧修补24 / 冷补42
  -- 20251027 web报表中以末次质量登记时间节点统计质量数据调整为首次质量登记时间做统计质量数据变更 createtime - > checktime
-                                            AND pd28.createtime >= @DATEBEGIN@
-                                            AND pd28.createtime < @DATEEND@ 
+                                            AND pd28.checktime >= @DATEBEGIN@
+                                            AND pd28.checktime < @DATEEND@ 
                                                                     AND (@USERCODE@ IS NULL OR @USERCODE@ = '' OR instr(pd28.groutingusercode, @USERCODE@) > 0)
                                                                         -- AND pd28.createtime >= to_date('2025-03-28', 'yyyy-MM-DD')
                                                                         -- AND pd28.createtime < to_date('2025-04-03 23:59:59', 'yyyy-mm-dd hh24:mi:ss')

wwwroot/mes/rpt/rpt310/rpt.ashx

@@ -233,7 +233,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
                 //获取分页参数
                 int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-                int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
+                int rows = HttpContext.Current.Request["rows"] is int ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10000;
                 string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";