修改次破报表翻页汇总不正确问题

chenlu

2025-10-30 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3

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

@@ -59,6 +59,8 @@
        <result column="order_id" property="materialOutbound.orderId"/>
        <result column="project" property="materialOutbound.project"/>
        <result column="batch" property="materialOutbound.batch"/>

        <result column="date_of_manufacture" property="materialOutboundDetail.dateOfManufacture"/>
    </resultMap>


@@ -625,19 +627,27 @@
    </select>

    <select id="getMaterialInventoryCount" >
        select * 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} and producer=#{producer}
    </select>

    <select id="getMaterialInventoryCountNull" >
        select * 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  and producer=#{producer}
    </select>

    <select id="getMaterialInventoryCount1" >
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer} and id!=#{id}
    </select>

    <select id="getMaterialInventoryCountNull1" >
        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null  and producer=#{producer} and id!=#{id}
    </select>

    <select id="getMaterialInventoryCountId" >
        select id from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
        select id from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer}
    </select>

    <select id="getMaterialInventoryCountNullId" >
        select id from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
        select id from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null and producer=#{producer}
    </select>

    <select id="getIsNotMaterialOutboundDetail" >
@@ -817,33 +827,34 @@
                                         available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
                                         total_area=single_piece_area*inventory_quantity
                                     where  material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
                                       and producer=#{materialInventory.producer}
    </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
        where  material_code=#{materialCode} and date_of_manufacture is null and producer=#{materialInventory.producer}
    </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}
        where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture} and producer=#{producer}
    </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
        where  material_code=#{materialCode} and date_of_manufacture is null and producer=#{producer}
    </update>

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


    </update>
@@ -851,7 +862,7 @@
    <update id="updateMaterialInventoryReturningNull" >
        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
        where  material_code=#{materialCode} and
            date_of_manufacture is null
            date_of_manufacture is null and producer=#{returningWarehouseDetail.producer}


    </update>
@@ -1003,6 +1014,7 @@
    <select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <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 != ''">
@@ -1076,6 +1088,7 @@
        select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
        count(ml.id) as 'total'
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <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 != ''">
@@ -1143,10 +1156,54 @@
    </select>


    <select id="exportMaterialLogReport">
        select * from mm.material_log ml
    <select id="exportMaterialLogReport" >
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
                                left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>

    <select id="exportMaterialLogReports" >
        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="exportMaterialLogOptimizeOutboundReport">
        SELECT
        ml.id,
        ml.operate_type,
        ml.operation_order_number,
        ml.project_no,
        ml.producer,
        ml.inventory_area,
        ml.remarks,
        ml.inventory_id,
        ml.material_code,
        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,
        ml.project_no,
        ml.operation_number

        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)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type='物料出库'
        order by ml.id desc
    </select>

    <select id="deleteMaterialInventory">
@@ -1297,7 +1354,6 @@
    <select id="getSelectMaterialInventoryMes">
        select
            mi.material_code AS materialCode,
            mi.producer,
            sum(mi.available_quantity) AS quantity,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
@@ -1310,4 +1366,34 @@
        order by mi.id desc
    </select>

    <update id="updateMaterialInventoryAll" >
        update mm.material_inventory set date_of_manufacture=#{materialInventory.dateOfManufacture},
                                         producer=#{materialInventory.producer},
                                         quality_guarantee_period=#{materialInventory.qualityGuaranteePeriod},
                                         inventory_area=#{materialInventory.inventoryArea},
                                         remarks=#{materialInventory.remarks},
                                         inventory_organization=#{materialInventory.inventoryOrganization}
        where id=#{materialInventoryId}
    </update>

    <update id="updateMaterialInventoryOne" >
        update mm.material_inventory set
                                         quality_guarantee_period=#{materialInventory.qualityGuaranteePeriod},
                                         inventory_area=#{materialInventory.inventoryArea},
                                         remarks=#{materialInventory.remarks},
                                         available_quantity=available_quantity+#{materialInventory.availableQuantity},
                                         inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                         total_area=inventory_quantity*single_piece_area
        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
        order by mi.id desc
    </select>

</mapper>