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

guoyujie

2025-04-08 1e1c416c6aa6596feb333b75d882ffeede73d3c9

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

@@ -58,10 +58,10 @@
        ms.json
        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
        <where>
                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
                 and mi.available_quantity>0

        </where>
        limit #{offset},#{pageSize};
        order by mi.id desc
    </select>

    <select id="getSelectMaterialInventoryDatePageTotal">
@@ -71,10 +71,9 @@
        from
        mm.material_inventory mi
        <where>
                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
                 and mi.available_quantity>0

        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -83,8 +82,8 @@
        ou.id as useId,
        ou.project_no as projectNo,
        mi.inventory_quantity AS inventoryQuantity,
        mi.plan_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        mi.available_quantity AS availableQuantity,
        ou.not_use_count AS planQuantity,
        mi.id,
        mi.inventory_organization as inventoryOrganization,
        mi.material_code AS materialCode,
@@ -101,25 +100,22 @@
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        left join pp.optimize_project op on op.project_no=ou.project_no
        <where>
            mi.plan_quantity>0 and op.state>=100 and
            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
            ou.not_use_count>0 and mi.plan_quantity>0 and op.state>=100 and ou.state=1

        </where>
        limit #{offset},#{pageSize};
        order by ou.id desc
    </select>

    <select id="getSelectMaterialInventoryEngineeringDatePageTotal">
        select
        CEILING(count(id)/#{pageSize}) as 'pageTotal',
        count(id) as 'total'
        from
        pp.optimize_use ou
        CEILING(count(ou.id)/#{pageSize}) as 'pageTotal',
        count(ou.id) as 'total'
        from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        left join pp.optimize_project op on op.project_no=ou.project_no
        <where>
            ou.not_use_count>0 and ou.state=1 and
            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
            mi.plan_quantity>0 and op.state>=100 and ou.state=1

        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -152,7 +148,6 @@
            </if>

        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialInventoryPageTotal">
@@ -168,7 +163,6 @@

        </where>

        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialInventoryEngineering">
@@ -176,8 +170,9 @@
        ou.id as useId,
        ou.project_no as projectNo,
        mi.inventory_quantity AS inventoryQuantity,
        mi.plan_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        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,
@@ -203,7 +198,6 @@

        </where>

        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -222,7 +216,6 @@

        </where>

        limit #{offset},#{pageSize};
    </select>


@@ -255,7 +248,7 @@
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
        </where>
        order by mo.reviewed_state desc,mo.create_time desc
        order by mo.create_time desc
        limit #{offset},#{pageSize};
    </select>

@@ -289,7 +282,6 @@
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -371,7 +363,6 @@
                and rw.batch regexp #{returningWarehouse.batch}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialOutbound">
@@ -426,11 +417,11 @@
                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialOutboundEngineering" >
        select
        ou.id as useId,
        ou.project_no as  projectNo,
        modd.inventory_id as id,
        modd.inventory_organization as inventoryOrganization,
@@ -457,7 +448,6 @@
                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectMaterialOutboundDetailPageTotal">
@@ -471,7 +461,6 @@
                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -509,7 +498,6 @@
                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectReturningWarehouseDetailPageTotal">
@@ -523,7 +511,6 @@
                and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>


@@ -547,16 +534,40 @@
        delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
    </delete>

    <delete id="deleteMaterialLog" >
        delete from mm.material_log where operation_order_number=#{materialOutboundId}
    </delete>

    <delete id="deleteMaterialLogById" >
        delete from mm.material_log where id=#{id}
    </delete>

    <delete id="deleteReturningWarehouseDetail" >
        delete from mm.returning_warehouse_detail where returning_id=#{returningId}
    </delete>

    <delete id="deleteReturningWarehouse" >
        delete from mm.returning_warehouse where returning_id=#{returningId}
    </delete>

    <select id="getMaximum" >
        select count(*) from mm.material_outbound where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
        from
            mm.material_outbound as a
        where
            date(a.create_time) = curdate()

    </select>

    <select id="getMaximums" >
        select count(*) from mm.returning_warehouse where  date(create_time)=CURDATE()
        select
            ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
        from
            mm.returning_warehouse as a
        where
            date(a.create_time) = curdate()

    </select>

    <select id="getMaterialOutboundCount" >
@@ -576,11 +587,11 @@
    </select>

    <select id="getMaterialInventoryCount" >
        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
    </select>

    <select id="getMaterialInventoryCountNull" >
        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
    </select>

    <select id="getMaterialInventoryCountId" >
@@ -607,6 +618,17 @@
                #{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
                   0,now()
               )
    </insert>

    <insert id="updateMaterialOutbound"  >
        update mm.material_outbound
        set material_requisition_personnel=#{materialOutbound.materialRequisitionPersonnel},
            material_requisition_team=#{materialOutbound.materialRequisitionTeam},
            order_id=#{materialOutbound.orderId},
            outbound_type=#{materialOutbound.outboundType},
            warehouse_manager=#{materialOutbound.warehouseManager},
            material_requisition_date=#{materialOutbound.materialRequisitionDate}
        where material_outbound_id = #{number}
    </insert>

    <insert id="insertMaterialOutboundDetail"  useGeneratedKeys="true" >
@@ -663,14 +685,14 @@
    </insert>

    <update id="updateMaterialInventoryAvailableOptOut">
        update mm.material_inventory
        set available_quantity=available_quantity-#{quantity}
        update pp.optimize_use
        set not_use_count=not_use_count-#{quantity}
        where id=#{useId}
    </update>

    <update id="updateMaterialInventoryAvailableOptInt">
        update mm.material_inventory
        set available_quantity=available_quantity+#{quantity}
        update pp.optimize_use
        set not_use_count=not_use_count+#{quantity}
        where id=#{useId}
    </update>

@@ -686,15 +708,27 @@
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
    <update id="updateMaterialInventoryInventoryPlanQuantityOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
    <update id="updateMaterialInventoryInventoryPlanQuantityInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryOut">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryInventoryInt">
        update mm.material_inventory
        set inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

@@ -707,6 +741,13 @@
    <update id="updateMaterialInventoryAvailableInventoryInt">
        update mm.material_inventory
        set available_quantity=available_quantity+#{quantity},inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

    <update id="updateMaterialInventoryAvailableInventoryOutMes">
        update mm.material_inventory
        set available_quantity=available_quantity-#{quantity},inventory_quantity=inventory_quantity-#{quantity},
            plan_quantity=plan_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
        where id=#{inventoryId}
    </update>

@@ -734,13 +775,33 @@
    <update id="updateMaterialInventory" >
        update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                         available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
                                         total_area=total_area+#{totalArea}
                                         total_area=single_piece_area*inventory_quantity
                                     where  material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
    </update>

    <update id="updateMaterialInventoryNull" >
        update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                         available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode} and date_of_manufacture is null
    </update>

    <update id="updateMaterialInventoryOut" >
        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
                                         available_quantity=available_quantity-#{quantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
    </update>

    <update id="updateMaterialInventoryNullOut" >
        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
                                         available_quantity=available_quantity-#{quantity},
                                         total_area=single_piece_area*inventory_quantity
        where  material_code=#{materialCode} and date_of_manufacture is null
    </update>

    <update id="updateMaterialInventoryReturning" >
        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
                                         total_area=total_area+#{totalArea}
        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
       where  material_code=#{materialCode} and
                date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}

@@ -748,8 +809,7 @@
    </update>

    <update id="updateMaterialInventoryReturningNull" >
        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
                                         total_area=total_area+#{totalArea}
        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
        where  material_code=#{materialCode} and
            date_of_manufacture is null

@@ -849,5 +909,326 @@
        update mm.surplus_materials set quantity=quantity+#{surplusMaterials.quantity} where id=#{surplusMaterials.id}
    </update>

    <select id="getPrintCreateOutbound" >
        select id,
               material_outbound_id,
               material_requisition_personnel,
               material_requisition_team,
               order_id,
               outbound_type,
               warehouse_manager,
               date(material_requisition_date) as material_requisition_date,
               reviewed,
               date(reviewed_time) as reviewed_time,
               reviewed_state,
               date(create_time) as create_time
        from mm.material_outbound
        where material_outbound_id = #{materialOutboundId}
    </select>

    <select id="getPrintCreateOutboundDetail" >
        select
            ou.project_no as  projectNo,
            modd.inventory_id as id,
            modd.inventory_organization as inventoryOrganization,
            modd.material_code as materialCode,
            modd.material_name as materialName,
            modd.producer,
            modd.width,
            modd.height,
            modd.thickness,
            modd.unit,
            modd.outbound_quantity as outboundQuantity,
            date(modd.date_of_manufacture) as dateOfManufacture,
            modd.single_piece_area as singlePieceArea,
            modd.inventory_area as inventoryArea,
            modd.remarks,
            ou.use_count as inventoryQuantity,
            if(mo.reviewed_state!=1,modd.outbound_quantity+ou.not_use_count,ou.not_use_count) as availableQuantity,
            ms.json,
            modd.producer
        from mm.material_outbound_detail modd left join pp.optimize_use ou on modd.use_id=ou.id
                                              left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
                                              left join mm.material_store ms on modd.material_code=ms.id
        where modd.material_outbound_id = #{materialOutboundId}
    </select>

    <select id="getMaterialInventoryById" >
        select
            *
        from mm.material_inventory mi
        where mi.id = #{id}
    </select>

    <select id="getMaterialLogReport" >
        select *
        from mm.material_log ml
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
                and ml.operate_type regexp #{materialLog.operateType}
            </if>
            <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
                and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
            </if>
            <if test="materialLog.operationNumber != null and materialLog.operationNumber != ''">
                and ml.operation_number regexp #{materialLog.operationNumber}
            </if>
            <if test="materialLog.quantity != null and materialLog.quantity != ''">
                and ml.quantity regexp #{materialLog.quantity}
            </if>
            <if test="materialLog.width != null and materialLog.width != ''">
                and  ml.width regexp  REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
            </if>
            <if test="materialLog.height != null and materialLog.height != ''">
                and  ml.height regexp  REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
            </if>
            <if test="materialLog.thickness != null and materialLog.thickness != ''">
                and  ml.thickness regexp  REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
            </if>

            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}
            </if>
            <if test="materialLog.unit != null and materialLog.unit != ''">
                and  ml.unit regexp  #{materialLog.unit}
            </if>
            <if test="materialLog.singlePieceArea != null and materialLog.singlePieceArea != ''">
                and  ml.singlePieceArea regexp REGEXP_REPLACE(#{materialLog.singlePieceArea},'\\.0+$','')
            </if>
            <if test="materialLog.inventoryArea != null and materialLog.inventoryArea != ''">
                and  ml.inventoryArea regexp  #{materialLog.inventoryArea}
            </if>
            <if test="materialLog.operator != null and materialLog.operator != ''">
                and  ml.operator regexp  #{materialLog.operator}
            </if>
            <if test="materialLog.remarks != null and materialLog.remarks != ''">
                and ml.remarks regexp #{materialLog.remarksr}
            </if>
            <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
                and ml.project_no regexp #{materialLog.projectNo}
            </if>
        </where>
        order by ml.id desc
        limit #{offset},#{pageSize};
    </select>


    <select id="getMaterialLogReportTotal">
        select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
        count(ml.id) as 'total'
        from mm.material_log ml
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
                and ml.operate_type regexp #{materialLog.operateType}
            </if>
            <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
                and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
            </if>
            <if test="materialLog.operationNumber != null and materialLog.operationNumber != ''">
                and ml.operation_number regexp #{materialLog.operationNumber}
            </if>
            <if test="materialLog.quantity != null and materialLog.quantity != ''">
                and ml.quantity regexp #{materialLog.quantity}
            </if>
            <if test="materialLog.width != null and materialLog.width != ''">
                and  ml.width regexp  REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
            </if>
            <if test="materialLog.height != null and materialLog.height != ''">
                and  ml.height regexp  REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
            </if>
            <if test="materialLog.thickness != null and materialLog.thickness != ''">
                and  ml.thickness regexp  REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
            </if>

            <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
                and  ml.inventory_id regexp  #{materialLog.inventoryId}
            </if>
            <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
                and  ml.material_code regexp  #{materialLog.materialCode}
            </if>
            <if test="materialLog.materialName != null and materialLog.materialName != ''">
                and  ml.material_name regexp  #{materialLog.materialName}
            </if>
            <if test="materialLog.producer != null and materialLog.producer != ''">
                and  ml.producer regexp  #{materialLog.producer}
            </if>
            <if test="materialLog.unit != null and materialLog.unit != ''">
                and  ml.unit regexp  #{materialLog.unit}
            </if>
            <if test="materialLog.singlePieceArea != null and materialLog.singlePieceArea != ''">
                and  ml.singlePieceArea regexp REGEXP_REPLACE(#{materialLog.singlePieceArea},'\\.0+$','')
            </if>
            <if test="materialLog.inventoryArea != null and materialLog.inventoryArea != ''">
                and  ml.inventoryArea regexp  #{materialLog.inventoryArea}
            </if>
            <if test="materialLog.operator != null and materialLog.operator != ''">
                and  ml.operator regexp  #{materialLog.operator}
            </if>
            <if test="materialLog.remarks != null and materialLog.remarks != ''">
                and ml.remarks regexp #{materialLog.remarksr}
            </if>
        </where>
    </select>


    <select id="exportMaterialLogReport">
        select * from mm.material_log ml
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>

    <select id="deleteMaterialInventory">
        delete from
        mm.material_inventory mi
        <where>
            <if test="ids != null and ids != ''">
                and mi.id in
                <foreach item="id" collection="ids" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>

        </where>
    </select>

    <select id="getSelectMaterialOutboundProjectNo">
        select * from mm.material_outbound mo where order_id=#{projectNo}
    </select>

    <select id="getSelectOptimizeUses">
        select * from pp.optimize_use  where project_no=#{projectNo} and width=#{width} and height=#{height} and state=1
    </select>

    <select id="getSelectMaterialOutboundOptimizeUses">
        select * from mm.material_outbound_detail mo
        <where>
            mo.material_outbound_id=#{materialOutboundId}
            <if test="useId != null">
               and mo.use_id=#{useId}
            </if>
        </where>
    </select>

    <update id="updateMaterialOutboundOptimizeUses">
        update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
    </update>

    <update id="updateOptimizeUsesMes">
        update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
    </update>

    <insert id="insertMaterialOutboundDetailOptimizeUses"  useGeneratedKeys="true" >
        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
                                                 outbound_quantity,single_piece_area,inventory_area,date_of_manufacture)
        values (
                   #{materialOutboundId} ,#{number},#{materialCode},#{useId},#{inventoryId},'原片库',#{outboundQuantity},
                   #{singlePieceArea},#{inventoryArea},#{dateOfManufacture}
               )
    </insert>

    <insert id="insertMaterialOutboundOptimizeUses"  useGeneratedKeys="true" >
        insert into mm.material_outbound(material_outbound_id,order_id,outbound_type,
                                         warehouse_manager,material_requisition_date,reviewed_state,reviewed,create_time,reviewed_time)
        values (
                   #{materialOutboundId} ,#{projectNo},'标准出库',#{name},now(),1,#{name},now(),now()
               )
    </insert>

    <select id="selectProjectNo">
        select project_no from pp.optimize_use where id=#{useId};
    </select>

    <select id="getOptimizeOutboundReport">
        SELECT
            ml.operation_order_number,
            ml.project_no,
            ml.inventory_id,
            ml.material_name,
            ml.unit,
            ml.width,
            ml.height,
            ml.thickness,
            ml.quantity,
            round(ml.width*ml.height*ml.quantity/1000000,2) as area,
            ou.use_count,
            ou.not_use_count,
            ml.operator,
            ml.operate_time

        FROM
            mm.material_log AS ml
                LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
                AND ou.raw_stock_code = ml.inventory_id
        WHERE
            ou.project_no IS NOT NULL
               AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) &lt;= #{endDate}
            and ml.operate_type=#{type}

        <if test="materialLog.operationOrderNumber != null and materialLog.operationOrderNumber != ''">
            and ml.operation_order_number regexp #{materialLog.operationOrderNumber}
        </if>
        <if test="materialLog.useCount != null and materialLog.useCount != ''">
            and ou.use_count regexp #{materialLog.useCount}
        </if>
        <if test="materialLog.quantity != null and materialLog.quantity != ''">
            and ml.quantity regexp #{materialLog.quantity}
        </if>
        <if test="materialLog.width != null and materialLog.width != ''">
            and  ml.width regexp  REGEXP_REPLACE(#{materialLog.width},'\\.0+$','')
        </if>
        <if test="materialLog.height != null and materialLog.height != ''">
            and  ml.height regexp  REGEXP_REPLACE(#{materialLog.height},'\\.0+$','')
        </if>
        <if test="materialLog.thickness != null and materialLog.thickness != ''">
            and  ml.thickness regexp  REGEXP_REPLACE(#{materialLog.thickness},'\\.0+$','')
        </if>

        <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
            and  ml.inventory_id regexp  #{materialLog.inventoryId}
        </if>

        <if test="materialLog.materialName != null and materialLog.materialName != ''">
            and  ml.material_name regexp  #{materialLog.materialName}
        </if>
        <if test="materialLog.producer != null and materialLog.producer != ''">
            and  ml.producer regexp  #{materialLog.producer}
        </if>
        <if test="materialLog.unit != null and materialLog.unit != ''">
            and  ml.unit regexp  #{materialLog.unit}
        </if>
        <if test="materialLog.operator != null and materialLog.operator != ''">
            and  ml.operator regexp  #{materialLog.operator}
        </if>
        <if test="materialLog.remarks != null and materialLog.remarks != ''">
            and ml.remarks regexp #{materialLog.remarksr}
        </if>
        order by ml.id desc
        limit #{offset},#{pageSize};
    </select>

    <select id="getOptimizeOutboundReportTotal">
        SELECT
            CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
                count(ml.id) as 'total'

        FROM
            mm.material_log AS ml
                LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
                AND ou.raw_stock_code = ml.inventory_id
        WHERE
            ou.project_no IS NOT NULL
          AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) &lt;= #{endDate}
          and ml.operate_type=#{type}
    </select>
</mapper>