From cbcf3b7306b31cc1553fe4cfd5b6fa6624259d9a 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 Jan 2019 21:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A5=E5=BA=93=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E3=80=81=E5=87=BA=E5=BA=93=E6=B1=87=E6=80=BB=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/reports/in_material_count.html                | 2 +-
 erp_web/pages/reports/out_material_count.html               | 2 +-
 .../java/com/jsh/erp/controller/DepotHeadController.java    | 6 ++----
 src/main/resources/mapper_xml/DepotHeadMapperEx.xml         | 5 +++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html
index 40c61202..6a2e7d34 100644
--- a/erp_web/pages/reports/in_material_count.html
+++ b/erp_web/pages/reports/in_material_count.html
@@ -281,7 +281,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_material_count.html b/erp_web/pages/reports/out_material_count.html
index 7aeba618..b13c6ea2 100644
--- a/erp_web/pages/reports/out_material_count.html
+++ b/erp_web/pages/reports/out_material_count.html
@@ -281,7 +281,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 f1be11e8..28e21a2d 100644
--- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -209,9 +209,7 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
-            Integer limitStart = (currentPage-1)*pageSize;
-            Integer limitEnd = pageSize;
-            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, limitStart, limitEnd);
+            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
             map.put("total", total);
             //存放数据json数组
@@ -258,7 +256,7 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InOutMCount> resList = new ArrayList<DepotHeadVo4InOutMCount>();
-            List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
+            List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
             map.put("total", total);
             //存放数据json数组
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 5e62d500..2209360c 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -205,8 +205,8 @@
     </select>
 
     <select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
-        select count(1)
-        from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId
+        select count(1) from
+        (select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId
         INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName
         from jsh_material INNER JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id) m
         on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
@@ -219,6 +219,7 @@
         <if test="pid == null">
             and di.DepotId in (${dids})
         </if>
+        GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName) a
     </select>
 
     <select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">