Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

16 小时以前 03386a78c3a1f92efa21a6748e38c2c5d1c996d9

 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java

@@ -62,7 +62,7 @@
    }


    @GetMapping("importStockInventory")
    @PostMapping("importStockInventory")
    @ApiOperation("导入库存")
    public R importStockInventory(MultipartFile  file) {
        return stockInventoryService.importStockInventory(file);
@@ -81,4 +81,16 @@
    public void exportStockInventory(HttpServletResponse response,StockInventoryDto stockInventoryDto) {
         stockInventoryService.exportStockInventory(response,stockInventoryDto);
    }

    @GetMapping("stockInventoryPage")
    @ApiOperation("库存报表查询")
    public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
        return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
    }

    @GetMapping("stockInAndOutRecord")
    @ApiOperation("统计各个产品的入库和出库记录")
    public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
        return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
    }
}