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

guoyuji

2024-10-12 b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5

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

@@ -17,6 +17,7 @@
                and m.type regexp #{materialStore.type}
            </if>
        </where>
        order by m.id desc
        limit #{offset},#{pageSize};
    </select>

@@ -57,6 +58,14 @@
        delete from mm.material_store where id=#{id}
    </delete>

    <select id="selectMaterialStore" >
        select count(*) from mm.material_inventory where material_code=#{id}
    </select>

    <select id="selectMaterialStoreJson" >
        select count(*) from mm.material_store where json=#{json}
    </select>