Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

8 天以前 ca0565e53494417b3779759f8d3898e07bfd5929

 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -38,6 +40,18 @@
    private ProcurementRecordService procurementRecordService;


    /**
     * 通过销售产品id获取入库数量
     * @param salesProductId
     * @return
     */
    @GetMapping("/getProcurementAmount")
    @ApiOperation(value = "通过销售产品id获取入库数量")
    public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
        return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId));
    }


    @GetMapping("/productlist")
    @Log(title = "采购入库-入库管理-新增入库查询", businessType = BusinessType.OTHER)
    public AjaxResult list(ProcurementDto procurementDto) {
@@ -68,7 +82,7 @@
        return procurementRecordService.updateCustom(customStorage);
    }

    @DeleteMapping("/deleteCustom")
    @Delete("/delteCustom")
    @Log(title = "自定义入库-入库管理-删除入库", businessType = BusinessType.DELETE)
    @Transactional
    public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
@@ -89,12 +103,7 @@
        return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
    }

    @PostMapping("/updateManagementByCustom")
    @Log(title = "自定义入库-库存台账-修改", businessType = BusinessType.UPDATE)
    @Transactional
    public AjaxResult updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
        return AjaxResult.success(procurementRecordService.updateManagementByCustom(procurementDto));
    }


    @GetMapping("/detailManagementByCustom")
    @ApiOperation(value = "自定义入库-详情")
@@ -125,12 +134,24 @@
        IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
        return AjaxResult.success(result);
    }

    @GetMapping("/listReport")
    @ApiOperation(value = "查询库存图表数据")
    public AjaxResult listReport() {
        return AjaxResult.success(procurementRecordService.getReportList());
    }
    @GetMapping("/listPageByProduction")
    @Log(title = "生产入库-入库管理-入库查询", businessType = BusinessType.OTHER)
    @ApiOperation(value = "入库查询")
    public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
        IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
        return AjaxResult.success(result);
    }

    @GetMapping("/listPageByProductProduction")
    @Log(title = "生产入库-入库管理-生产入库查询", businessType = BusinessType.OTHER)
    @ApiOperation(value = "入库查询")
    public AjaxResult listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
        IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
        return AjaxResult.success(result);
    }

@@ -222,35 +243,16 @@
     * @param response
     */
    @PostMapping("/exportTwo")
    public void exportTwo(HttpServletResponse response,@RequestBody List<CustomStorage> customStorage) {
        if(CollectionUtils.isEmpty(customStorage)){
            customStorage = customStorageMapper.selectList(null);
        }
        for (CustomStorage storage : customStorage) {
            // nginx 前端访问图片
            storage.setUrl("http://114.132.189.42:9044"+storage.getUrl());
        }
    public void exportTwo(HttpServletResponse response) {
        List<CustomStorage> customStorages = customStorageMapper.selectList(null);
        ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
        util.exportExcel(response, customStorage, "入库台账");
        util.exportExcel(response, customStorages, "入库台账");
    }

    /**
     * 入库，出库管理自定义导出，保存文件到本地返回路径
     * @param customStorage
     */
    @PostMapping("/exportTwoSave")
    public AjaxResult exportTwoSave(@RequestBody List<CustomStorage> customStorage) {
        if(CollectionUtils.isEmpty(customStorage)){
            customStorage = customStorageMapper.selectList(null);
        }
        for (CustomStorage storage : customStorage) {
            // nginx 前端访问图片
            storage.setUrl("http://114.132.189.42:9044" + storage.getUrl());
        }
        ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);

        return util.exportExcel(customStorage,"入库台账" , "入库台账");
    @GetMapping("/listPageProductionStock")
    @Log(title = "库存管理-成品库存", businessType = BusinessType.OTHER)
    public AjaxResult listPageProductionStock(Page page) {
        IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page);
        return AjaxResult.success(result);
    }


}