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

2021-11-15 00:18:09 +08:00
parent f5b4c3f736
commit 7b33aba0d6
3 changed files with 13 additions and 13 deletions
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -592,8 +592,8 @@ public class MaterialController {
    @ApiOperation(value = "商品库存查询")
    public BaseResponseInfo getListWithStock(@RequestParam("currentPage") Integer currentPage,
                                             @RequestParam("pageSize") Integer pageSize,
-                                             @RequestParam("depotId") Long depotId,
-                                             @RequestParam("categoryId") Long categoryId,
+                                             @RequestParam(value = "depotId", required = false) Long depotId,
+                                             @RequestParam(value = "categoryId", required = false) Long categoryId,
                                             @RequestParam("materialParam") String materialParam,
                                             @RequestParam("zeroStock") Integer zeroStock,
                                             @RequestParam("mpList") String mpList,