Merge branch 'refs/heads/dev_New' into dev_New_pro

liyong

2026-04-20 5bc029a31c4325d39f77fb6cb613a5e31df7ece3

 src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java

@@ -60,7 +60,7 @@
    BigDecimal getProcurementAmount(Long salesProductId);
    InventoryInformationDto getReportList();

    IPage<ProductModel> listPageProductionStock(Page page);
    IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto procurementDto);

    IPage<ProcurementPageDto> listPageByProductProduction(Page page, ProcurementPageDto procurementDto);
}