Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

gongchunyi

19 小时以前 520a715610bd67a6401e989ada8b1c43a312163b

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -391,7 +391,6 @@

    @Override
    public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {

        List<StockInventoryExportData> list = stockInventoryMapper.listStockInventoryExportData(stockInventoryDto);
        ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
        util.exportExcel(response, list, "库存信息");
@@ -403,6 +402,13 @@
    }

    @Override
    public void exportStockInventoryPage(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
        List<StockInRecordDto> list = stockInventoryMapper.stockInventoryPage(stockInventoryDto,new Page(-1,-1)).getRecords();
        ExcelUtil<StockInRecordDto> util = new ExcelUtil<>(StockInRecordDto.class);
        util.exportExcel(response, list, "库存报表导出");
    }

    @Override
    public IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto, Page page) {
        return stockInventoryMapper.stockInAndOutRecord(stockInventoryDto, page);
    }