diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html
index be21a76b..97e7d3a3 100644
--- a/erp_web/pages/reports/in_detail.html
+++ b/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);
                 }
             },
             //此处添加错误处理
diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html
index 4e46feab..0238eb2c 100644
--- a/erp_web/pages/reports/out_detail.html
+++ b/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);
                 }
             },
             //此处添加错误处理
diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 7a1cb3fb..f1be11e8 100644
--- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/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数组