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

zss

6 天以前 5507f1405049513051e5de4a570a6c9b6c1ddb64

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

@@ -13,5 +13,39 @@
        <result column="locked_quantity" property="lockedQuantity" />
        <result column="warn_num" property="warnNum" />
    </resultMap>
    <update id="updateAddStockInventory">
        update stock_inventory
        <set>
            <if test="qualitity != null">
                qualitity = qualitity + #{ew.qualitity},
            </if>
           <if test="version != null">
               version = version + 1,
            </if>
        </set>
        where product_model_id = #{ew.productModelId}
    </update>
    <update id="updateSubtractStockInventory">
        update stock_inventory
        <set>
            <if test="qualitity != null">
                qualitity = qualitity - #{ew.qualitity},
            </if>
            <if test="version != null">
                version = version + 1,
            </if>
        </set>
        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
    </update>
    <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
        select si.*,
               pm.model,
               pm.unit,
               p.product_name
        from stock_inventory si
                 left join product_model pm on si.product_model_id = pm.id
                 left join product p on pm.product_id = p.id
        where 1 = 1
    </select>

</mapper>