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

buhuazhen

8 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

 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">