Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

6 天以前 f7ca9752b8cc4d81d75a23bbcd89227a2e3abe69

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -1387,4 +1387,14 @@
        where id=#{materialInventoryId}
    </update>

    <select id="selectGetStockList">
        select mi.*, ms.json
        from mm.material_inventory mi
        left join mm.material_store ms
            on mi.material_code=ms.id
        where inventory_quantity>0
        and mi.inventory_organization = '原片库'
        order by mi.id desc
    </select>

</mapper>