diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 3ed687f3..fbf4cc6c 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -800,7 +800,7 @@
     function getMaterialInOutList(mId, pageNo, pageSize) {
         $.ajax({
             type: "get",
-            url: "/depotItem/findDetailByTypeAndMaterialId.action",
+            url: "/depotItem/findDetailByTypeAndMaterialId",
             dataType: "json",
             data: ({
                 materialId: mId,
diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 97d7cc8e..cb14db7f 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -100,13 +100,13 @@ public class DepotItemController {
                 dataArray.add(item);
             }
         }
-        objectMap.put("page", dataArray);
+        objectMap.put("page", queryInfo);
         if (list == null) {
             queryInfo.setRows(new ArrayList<Object>());
             queryInfo.setTotal(0);
             return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
         }
-        queryInfo.setRows(list);
+        queryInfo.setRows(dataArray);
         queryInfo.setTotal(depotItemService.findDetailByTypeAndMaterialIdCounts(parameterMap));
         return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
     }