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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

@@ -133,6 +133,14 @@
        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);
    }

    @GetMapping("/listPageByCustom")
    @Log(title = "自定义入库-入库管理-入库查询", businessType = BusinessType.OTHER)
    @ApiOperation(value = "入库查询")
@@ -147,6 +155,48 @@
        IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
        return AjaxResult.success(result);
    }

    @PostMapping("frozenStorageQuality")
    @Log(title = "采购入库-库存管理-冻结不合格产品", businessType = BusinessType.UPDATE)
    public AjaxResult frozenStorageQuality(@RequestBody List<Integer> frozenIds) {
        boolean result = procurementRecordService.frozenStorageQuality(frozenIds);
        if (result) {
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }

    @PostMapping("thawStorageQuality")
    @Log(title = "采购入库-库存管理-解冻不合格产品", businessType = BusinessType.UPDATE)
    public AjaxResult thawStorageQuality(@RequestBody List<Integer> thawIds) {
        boolean result = procurementRecordService.thawStorageQuality(thawIds);
        if (result) {
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }

    @PostMapping("frozenFinishedQuality")
    @Log(title = "采购入库-库存管理-冻结不合格产品", businessType = BusinessType.UPDATE)
    public AjaxResult frozenFinishedQuality(@RequestBody List<Integer> frozenIds) {
        boolean result = procurementRecordService.frozenFinishedQuality(frozenIds);
        if (result) {
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }

    @PostMapping("thawFinishedQuality")
    @Log(title = "采购入库-库存管理-解冻不合格产品", businessType = BusinessType.UPDATE)
    public AjaxResult thawFinishedQuality(@RequestBody List<Integer> thawIds) {
        boolean result = procurementRecordService.thawFinishedQuality(thawIds);
        if (result) {
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }



    @GetMapping("/listPageCopyByProduction")
    @Log(title = "生产入库-库存管理-分页查询", businessType = BusinessType.OTHER)
@@ -229,8 +279,8 @@

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