qinqi 2 лет назад
Родитель
Сommit
e5861e2d90
1 измененных файлов с 6 добавлено и 5 удалено
  1. 6 5
      wwwroot/mes/pm/fqcitems/fqcitemsdetail.ashx

+ 6 - 5
wwwroot/mes/pm/fqcitems/fqcitemsdetail.ashx

@@ -878,10 +878,9 @@ public class fqcitemsdetail : IHttpHandler, IReadOnlySessionState
                 sqlStr += " AND INSTR( m.REMARKS, @REMARKS@ ) > 0 ";
                 sqlPara.Add(new CDAParameter("REMARKS", form["REMARKS"]));
             }
-           if (sort != "")
-            {
-                sqlStr += "ORDER BY XUHAO,SID DESC";
-            }
+            
+             sqlStr += "ORDER BY XUHAO,SID DESC";
+             
             int total = 0;
             DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
             return new JsonResult(dt) { total = total }.ToJson();
@@ -960,13 +959,15 @@ public class fqcitemsdetail : IHttpHandler, IReadOnlySessionState
                     m.CREATEUSERID,
                     m.CREATETIME,
                     m.UPDATEUSERID,
-                    m.UPDATETIME
+                    m.UPDATETIME,
+                    m.XUHAO
                 FROM
                     TP_PM_FQCITEMSDETAIL m
                 WHERE 
                     m.VALUEFLAG = '1'
                     AND m.ACCOUNTID = @ACCOUNTID@
                     AND m.ITEMSDETAILID = @ITEMSDETAILID@
+                    order by m.XUHAO,m.ITEMSDETAILID
                 ",
                 new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
                 new CDAParameter("ITEMSDETAILID", HttpContext.Current.Request["id"])