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

zss

2026-05-18 c483ee040589c0063724059228e7e6c8e4ff943c

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -525,6 +525,7 @@
                    group by spd.stock_inventory_id
                 ) as sd on sd.stock_inventory_id = si.id
        where si.product_model_id = #{productModelId}
        and si.qualitity > IFNULL(sd.qualitity, 0)
    </select>

    <select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">