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

liyong

9 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

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

@@ -28,6 +28,9 @@
            <if test="ew.warnNum != null and ew.warnNum !=''">
                warn_num = #{ew.warnNum},
            </if>
            <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                locked_quantity = locked_quantity + #{ew.lockedQuantity},
            </if>
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId}
@@ -59,6 +62,7 @@
        si.version,
        (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
        pm.model,
        si.remark,
        pm.unit,
        p.product_name
        from stock_inventory si
@@ -74,6 +78,8 @@
        pm.model,
        pm.unit,
        p.product_name,
        coalesce(si.warn_num, 0) as warn_num,
        coalesce(si.locked_quantity, 0) as locked_quantity,
        si.remark,
        si.update_time
        from stock_inventory si
@@ -178,5 +184,9 @@
        pm.unit,
        p.product_name
    </select>
    <select id="selectTotal" resultType="java.math.BigDecimal">
        select sum(qualitity)
        from stock_inventory
    </select>

</mapper>