guoyuji
2025-02-24 f4a504f7fc66d8db27707ea198bd3561ba821e52
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -958,13 +958,13 @@
            </if>
            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventoryId regexp  #{materialLog.inventoryId}
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.materialCode regexp  #{materialLog.materialCode}
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.materialName regexp  #{materialLog.materialName}
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}
@@ -1019,13 +1019,13 @@
            </if>
            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventoryId regexp  #{materialLog.inventoryId}
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.materialCode regexp  #{materialLog.materialCode}
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.materialName regexp  #{materialLog.materialName}
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}