Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

2026-05-28 08553c034773008ba68b7b6709683b385610ee4f

 src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java

@@ -58,4 +58,9 @@
    List<StockInventory> getByModelId(@Param("productModelId") Long productModelId);

    IPage<StockInventoryDto> getBatchNoQty(Page page, @Param("ew") StockInventoryDto stockInventoryDto);

    /**
     * 分页查询产品库存和领用量
     */
    IPage<StockInventoryDto> pageStockAndBorrow(Page page, @Param("ew") StockInventoryDto stockInventoryDto);
}