purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决入库汇总、出库汇总分页的问题

Browse Source
This commit is contained in:
季圣华
2019-01-22 21:11:03 +08:00
parent 00587c9ae4
commit cbcf3b7306
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/reports/in_material_count.html
View File

@@ -281,7 +281,7 @@
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200 && res.data) { if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows); $("#tableData").datagrid('loadData', res.data);
} }
}, },
//此处添加错误处理 //此处添加错误处理

2
erp_web/pages/reports/out_material_count.html
View File

@@ -281,7 +281,7 @@
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200 && res.data) { if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows); $("#tableData").datagrid('loadData', res.data);
} }
}, },
//此处添加错误处理 //此处添加错误处理

6
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -209,9 +209,7 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>(); List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
Integer limitStart = (currentPage-1)*pageSize; List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, (currentPage-1)*pageSize, 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); int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
map.put("total", total); map.put("total", total);
//存放数据json数组 //存放数据json数组
@@ -258,7 +256,7 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
List<DepotHeadVo4InOutMCount> resList = new ArrayList<DepotHeadVo4InOutMCount>(); 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); int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
map.put("total", total); map.put("total", total);
//存放数据json数组 //存放数据json数组

5
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -205,8 +205,8 @@
</select> </select>
<select id="findInOutMaterialCountTotal" resultType="java.lang.Integer"> <select id="findInOutMaterialCountTotal" resultType="java.lang.Integer">
select count(1) select count(1) from
from jsh_depothead dh INNER JOIN jsh_depotitem di on dh.id=di.HeaderId (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 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 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}' 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"> <if test="pid == null">
and di.DepotId in (${dids}) and di.DepotId in (${dids})
</if> </if>
GROUP BY di.MaterialId,m.mName,m.Model,m.categoryName) a
</select> </select>
<select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount"> <select id="findStatementAccount" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultStatementAccount">