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

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -97,9 +97,9 @@ public class DepotHeadController {
     @ApiOperation(value = "入库出库明细接口")
     public BaseResponseInfo findInDetail(@RequestParam("currentPage") Integer currentPage,
                                         @RequestParam("pageSize") Integer pageSize,
-                                        @RequestParam("organId") Integer oId,
+                                        @RequestParam(value = "organId", required = false) Integer oId,
                                         @RequestParam("materialParam") String materialParam,
-                                        @RequestParam("depotId") Integer depotId,
+                                        @RequestParam(value = "depotId", required = false) Integer depotId,
                                         @RequestParam("beginTime") String beginTime,
                                         @RequestParam("endTime") String endTime,
                                         @RequestParam("type") String type,
@@ -147,9 +147,9 @@ public class DepotHeadController {
     @ApiOperation(value = "入库出库统计接口")
     public BaseResponseInfo findInOutMaterialCount(@RequestParam("currentPage") Integer currentPage,
                                          @RequestParam("pageSize") Integer pageSize,
-                                         @RequestParam("organId") Integer oId,
+                                         @RequestParam(value = "organId", required = false) Integer oId,
                                          @RequestParam("materialParam") String materialParam,
-                                         @RequestParam("depotId") Integer depotId,
+                                         @RequestParam(value = "depotId", required = false) Integer depotId,
                                          @RequestParam("beginTime") String beginTime,
                                          @RequestParam("endTime") String endTime,
                                          @RequestParam("type") String type,
@@ -198,10 +198,10 @@ public class DepotHeadController {
     @ApiOperation(value = "调拨明细统计")
     public BaseResponseInfo findallocationDetail(@RequestParam("currentPage") Integer currentPage,
                                                  @RequestParam("pageSize") Integer pageSize,
-                                                 @RequestParam("organId") Integer oId,
+                                                 @RequestParam(value = "organId", required = false) Integer oId,
                                                  @RequestParam("materialParam") String materialParam,
-                                                 @RequestParam("depotId") Integer depotId,
-                                                 @RequestParam("depotIdF") Integer depotIdF,
+                                                 @RequestParam(value = "depotId", required = false) Integer depotId,
+                                                 @RequestParam(value = "depotIdF", required = false) Integer depotIdF,
                                                  @RequestParam("beginTime") String beginTime,
                                                  @RequestParam("endTime") String endTime,
                                                  @RequestParam("subType") String subType,
@@ -242,7 +242,7 @@ public class DepotHeadController {
                                                    @RequestParam("pageSize") Integer pageSize,
                                                    @RequestParam("beginTime") String beginTime,
                                                    @RequestParam("endTime") String endTime,
-                                                   @RequestParam("organId") Integer organId,
+                                                   @RequestParam(value = "organId", required = false) Integer organId,
                                                    @RequestParam("supType") String supType,
                                                    HttpServletRequest request) throws Exception{
         BaseResponseInfo res = new BaseResponseInfo();

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

@@ -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>();

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,