From c0e43886a8913098beeb3758b8e79f03e1720549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 24 Dec 2018 21:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=95=86=E5=93=81id=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8D=95=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?-=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html                         | 2 +-
 src/main/java/com/jsh/erp/controller/DepotItemController.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);
     }