From 6cb3a4a6df45604dd043a1bbe9bb4bb8ce0a0793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 22 Jun 2021 22:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/DepotItemController.java   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 65d44a69..890b1930 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -64,7 +64,6 @@ public class DepotItemController {
             @RequestParam("materialId") String mId, HttpServletRequest request)throws Exception {
         Map<String, String> parameterMap = ParamUtils.requestToMap(request);
         parameterMap.put("mId", mId);
-        PageQueryInfo queryInfo = new PageQueryInfo();
         Map<String, Object> objectMap = new HashMap<String, Object>();
         if (pageSize != null && pageSize <= 0) {
             pageSize = 10;
@@ -78,28 +77,27 @@ public class DepotItemController {
         if (list != null) {
             for (DepotItemVo4DetailByTypeAndMId d: list) {
                 JSONObject item = new JSONObject();
-                item.put("Number", d.getNumber()); //商品编号
+                item.put("number", d.getNumber()); //商品编号
                 String type = d.getType();
                 String subType = d.getSubType();
                 if(("其它").equals(type)) {
-                    item.put("Type", subType); //进出类型
+                    item.put("type", subType); //进出类型
                 } else {
-                    item.put("Type", subType + type); //进出类型
+                    item.put("type", subType + type); //进出类型
                 }
                 item.put("depotName", d.getDepotName()); //仓库名称
-                item.put("BasicNumber", d.getBnum()); //数量
-                item.put("OperTime", d.getOtime().getTime()); //时间
+                item.put("basicNumber", d.getBnum()); //数量
+                item.put("operTime", d.getOtime().getTime()); //时间
                 dataArray.add(item);
             }
         }
-        objectMap.put("page", queryInfo);
         if (list == null) {
-            queryInfo.setRows(new ArrayList<Object>());
-            queryInfo.setTotal(BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
+            objectMap.put("rows", new ArrayList<Object>());
+            objectMap.put("total", BusinessConstants.DEFAULT_LIST_NULL_NUMBER);
             return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code);
         }
-        queryInfo.setRows(dataArray);
-        queryInfo.setTotal(depotItemService.findDetailByTypeAndMaterialIdCounts(parameterMap));
+        objectMap.put("rows", dataArray);
+        objectMap.put("total", depotItemService.findDetailByTypeAndMaterialIdCounts(parameterMap));
         return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
     }