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

解决库存状态报表bug

Browse Source
This commit is contained in:
季圣华
2020-07-15 21:42:15 +08:00
parent fdeded44bb
commit a3bde11344
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -252,13 +252,14 @@ public class DepotItemController {
* 查找所有的明细 * 查找所有的明细
* @param currentPage * @param currentPage
* @param pageSize * @param pageSize
* @param projectId * @param depotId
* @param monthTime * @param monthTime
* @param headIds * @param name
* @param materialIds * @param model
* @param mpList * @param mpList
* @param request * @param request
* @return * @return
* @throws Exception
*/ */
@PostMapping(value = "/findByAll") @PostMapping(value = "/findByAll")
public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage, public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage,
@@ -278,7 +279,7 @@ public class DepotItemController {
List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(StringUtil.toNull(name), StringUtil.toNull(model), List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(StringUtil.toNull(name), StringUtil.toNull(model),
timeB,(currentPage-1)*pageSize, pageSize); timeB,(currentPage-1)*pageSize, pageSize);
String[] mpArr = mpList.split(","); String[] mpArr = mpList.split(",");
int total = depotItemService.findByAllCount(StringUtil.toNull(name), timeB, StringUtil.toNull(model)); int total = depotItemService.findByAllCount(StringUtil.toNull(name), StringUtil.toNull(model), timeB);
map.put("total", total); map.put("total", total);
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();