From 7b33aba0d68654c2a0912a149b800e75b2d41539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 15 Nov 2021 00:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=B0=86=E4=BB=93=E5=BA=93=E4=B9=8B=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotHeadController.java | 16 ++++++++-------- .../jsh/erp/controller/DepotItemController.java | 6 +++--- .../jsh/erp/controller/MaterialController.java | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 565c0a57..24e5c421 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/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(); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 52d7619c..523ed589 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/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 map = new HashMap(); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index d99f53ba..eafbd310 100644 --- 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,