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

优化报表查询，将仓库之类的参数改为非必传

Browse Source
This commit is contained in:
季圣华
2021-11-15 00:18:09 +08:00
parent f5b4c3f736
commit 7b33aba0d6
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -289,7 +289,7 @@ public class DepotItemController {
@ApiOperation(value = "查找所有的明细")
public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("depotId") Long depotId,
@RequestParam(value = "depotId", required = false) Long depotId,
@RequestParam("monthTime") String monthTime,
@RequestParam("materialParam") String materialParam,
@RequestParam("mpList") String mpList,
@@ -362,7 +362,7 @@ public class DepotItemController {
*/
@GetMapping(value = "/totalCountMoney")
@ApiOperation(value = "统计总计金额")
public BaseResponseInfo totalCountMoney(@RequestParam("depotId") Long depotId,
public BaseResponseInfo totalCountMoney(@RequestParam(value = "depotId", required = false) Long depotId,
@RequestParam("monthTime") String monthTime,
@RequestParam("materialParam") String materialParam,
HttpServletRequest request) throws Exception{
@@ -556,7 +556,7 @@ public class DepotItemController {
public BaseResponseInfo findStockWarningCount(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize,
@RequestParam("materialParam") String materialParam,
@RequestParam("depotId") Long depotId,
@RequestParam(value = "depotId", required = false) Long depotId,
@RequestParam("mpList") String mpList)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();