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

!19 修复入库明细和出库明细分页查询不了的问题

Browse Source 
Merge pull request !19 from hsj/master
This commit is contained in:
季圣华
2019-01-22 20:43:24 +08:00
parent bdd2ffea5c 00fcdd8175
commit 00587c9ae4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,7 +292,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_detail.html
View File

@@ -292,7 +292,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);
} }
}, },
//此处添加错误处理 //此处添加错误处理

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

@@ -209,7 +209,9 @@ 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>();
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize); Integer limitStart = (currentPage-1)*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数组