姜永辉 10 месяцев назад
Родитель
Сommit
91d1abe14b

+ 11 - 8
wwwroot/mes/rpt/rpt217/rpt.ashx

@@ -27,7 +27,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             FunctionalTesting = "61";//功能检测
             notInproc = "(16,60)";//排除工序
             defectcode = "'061','062','063','064','065','066','067','011'";
-             ProceduraID = " 25";
+            ProceduraID = " 25";
         }
 
         using (IDataAccess conn = DataAccess.Create())
@@ -221,16 +221,19 @@ TO_CHAR(基础数据.工号) 工号,
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 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;
-                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"] : "";
+                //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;
+                //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"] : "";
 
                 //获取分页数据    
                 int total = 0;
-                DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-                d.Columns.Remove("GID");//移除GID列
-                string jsonStr = new JsonResult(d) { total = total }.ToJson();
+                DataTable d = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                // DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                if (d != null && d.Rows.Count > 1) {
+                    d.Columns.Remove("GID");//移除GID列
+                }
+                string jsonStr = new JsonResult(d) { total =  d.Rows.Count }.ToJson();
                 context.Response.Write(jsonStr);
             }
         }

+ 1 - 1
wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -81,7 +81,7 @@
                     splitChar: '_',
                     columnMenu: '#btnColumnMenu',
                     columnMoving: true,
-                    pagination: true,
+                    pagination: false,
                     pagelist: [10000, 50, 100, 50, 1000, 5000],
                     pageSize: 10000
 

+ 11 - 7
wwwroot/mes/rpt/rpt218/rpt.ashx

@@ -212,16 +212,20 @@ TO_CHAR(基础数据.工号) 工号,
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 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;
-                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"] : "";
+                //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;
+                //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"] : "";
 
                 //获取分页数据    
                 int total = 0;
-                DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-                d.Columns.Remove("GID");//移除GID列
-                string jsonStr = new JsonResult(d) { total = total }.ToJson();
+                DataTable d = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                //DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                if (d != null && d.Rows.Count > 1) {
+                    d.Columns.Remove("GID");//移除GID列
+                }
+
+                string jsonStr = new JsonResult(d) { total = d.Rows.Count }.ToJson();
                 context.Response.Write(jsonStr);
             }
         }

+ 1 - 1
wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -85,7 +85,7 @@
                     splitChar: '_',
                     columnMenu: '#btnColumnMenu',
                     columnMoving: true,
-                    pagination: true,
+                    pagination: false,
                     pagelist: [10000, 50, 100, 50, 1000, 5000],
                     pageSize: 10000
 

+ 11 - 8
wwwroot/mes/rpt/rpt219/rpt.ashx

@@ -27,7 +27,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             FunctionalTesting = "61";//功能检测
             notInproc = "(16,60)";//排除工序
             defectcode = "'0083','0084'";
-             proceduareID = "26";
+            proceduareID = "26";
         }
 
         using (IDataAccess conn = DataAccess.Create())
@@ -223,16 +223,19 @@ TO_CHAR(基础数据.工号) 工号,
                 sqlPara.Add(new CDAParameter("kilproc", Convert.ToInt32(kilproc), DataType.Int32));
                 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;
-                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"] : "";
+                //int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
+                //int rows = (HttpContext.Current.Request["rows"] is object && HttpContext.Current.Request["rows"] !="NaN") ? 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"] : "";
 
                 //获取分页数据    
                 int total = 0;
-                DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-                d.Columns.Remove("GID");//移除GID列
-                string jsonStr = new JsonResult(d) { total = total }.ToJson();
+                DataTable d = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
+                //DataTable d = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+                if (d != null && d.Rows.Count > 1) {
+                    d.Columns.Remove("GID");//移除GID列
+                }
+                string jsonStr = new JsonResult(d) { total = dt.Rows.Count }.ToJson();
                 context.Response.Write(jsonStr);
             }
         }

+ 1 - 1
wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -85,7 +85,7 @@
                     splitChar: '_',
                     columnMenu: '#btnColumnMenu',
                     columnMoving: true,
-                    pagination: true,
+                    pagination: false,
                     pagelist: [10000, 50, 100, 50, 1000, 5000],
                     pageSize: 10000