!19 修复入库明细和出库明细分页查询不了的问题

Merge pull request !19 from hsj/master

erp_web/pages/reports/in_detail.html

@@ -292,7 +292,7 @@
             }),
             success: function (res) {
                 if(res && res.code === 200 && res.data) {
-                    $("#tableData").datagrid('loadData', res.data.rows);
+                    $("#tableData").datagrid('loadData', res.data);
                 }
             },
             //此处添加错误处理

erp_web/pages/reports/out_detail.html

@@ -292,7 +292,7 @@
             }),
             success: function (res) {
                 if(res && res.code === 200 && res.data) {
-                    $("#tableData").datagrid('loadData', res.data.rows);
+                    $("#tableData").datagrid('loadData', res.data);
                 }
             },
             //此处添加错误处理

src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -209,7 +209,9 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
-            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
+            Integer limitStart = (currentPage-1)*pageSize;
+            Integer limitEnd = pageSize;
+            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, limitStart, limitEnd);
             int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
             map.put("total", total);
             //存放数据json数组