blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2025-02-25 606e7a619b7d3f6388c19c462b74f60ea2334ea4 
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml


@@ -172,6 +172,7 @@


        mi.inventory_quantity AS inventoryQuantity,


        ou.not_use_count AS availableQuantity,


        ou.not_use_count AS planQuantity,


        ou.not_use_count AS outboundQuantity,


        mi.id,


        mi.inventory_organization as inventoryOrganization,


        mi.material_code AS materialCode,


@@ -957,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}


@@ -1018,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}