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

maven

9 小时以前 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3

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

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
@@ -62,17 +61,47 @@
    }


    @GetMapping("importStockInventory")
    @PostMapping("importStockInventory")
    @ApiOperation("导入库存")
    public R importStockInventory(MultipartFile  file) {
    public R importStockInventory(MultipartFile file) {
        return stockInventoryService.importStockInventory(file);
    }

    @Log(title = "下载库存导入模板", businessType = BusinessType.EXPORT)
    @PostMapping("/exportStockInventory")
    public void exportStockInventory(HttpServletResponse response) {
    @PostMapping("/downloadStockInventory")
    public void downloadStockInventory(HttpServletResponse response) {
        List<StockInventoryExportData> list = new ArrayList<>();
        ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
        util.exportExcel(response, list, "下载薪资管理列表模板");
        util.exportExcel(response, list, "库存模板");
    }

    @PostMapping("/exportStockInventory")
    @ApiOperation("导出库存")
    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));
    }

    @PostMapping("/frozenStock")
    @ApiOperation("冻结库存")
    public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
        return R.ok(stockInventoryService.frozenStock(stockInventoryDto));
    }

    @PostMapping("/thawStock")
    @ApiOperation("解冻库存")
    public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
        return R.ok(stockInventoryService.thawStock(stockInventoryDto));
    }
}