fix:1.库存报表（耗材和仓库筛选优化） 2.耗材和仓储物流导出字段优化 3.入库导出优化

liding

2026-03-20 b70456bfd425b107f68cfd60c6e6b25e143cea7c

 src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml

@@ -85,7 +85,7 @@
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_in_record
        from consumables_in_record
        group by product_model_id
        ) sir on si.product_model_id = sir.product_model_id
        -- 出库净重
@@ -93,7 +93,7 @@
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_out_record
        from consumables_out_record
        group by product_model_id
        ) sor on si.product_model_id = sor.product_model_id

@@ -126,7 +126,7 @@
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_in_record
        from consumables_in_record
        group by product_model_id
        ) sir on si.product_model_id = sir.product_model_id
        -- 出库净重
@@ -134,7 +134,7 @@
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_out_record
        from consumables_out_record
        group by product_model_id
        ) sor on si.product_model_id = sor.product_model_id
        where 1 = 1
@@ -146,7 +146,7 @@
    <select id="consumablesInventoryPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
        select
        sir.*,
        si.qualitity as current_consumables,
        si.qualitity as current_stock,
        pm.model,
        pm.unit,
        p.product_name,
@@ -155,7 +155,7 @@
        -- 当前净重 = 入库净重 - 出库净重
        IFNULL(inWeight.total_in_weight,0) - IFNULL(outWeight.total_out_weight,0) as current_weight

        from Consumables_in_record sir
        from consumables_in_record sir

        left join consumables_inventory si
        on sir.product_model_id = si.product_model_id
@@ -174,7 +174,7 @@
        select
        product_model_id,
        sum(net_weight) as total_in_weight
        from Consumables_in_record
        from consumables_in_record
        group by product_model_id
        ) inWeight
        on sir.product_model_id = inWeight.product_model_id
@@ -184,7 +184,7 @@
        select
        product_model_id,
        sum(net_weight) as total_out_weight
        from Consumables_out_record
        from consumables_out_record
        group by product_model_id
        ) outWeight
        on sir.product_model_id = outWeight.product_model_id
@@ -208,9 +208,9 @@
        pm.model,
        pm.unit,
        p.product_name,
        MAX(current_inventory) as current_consumables,
        SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END) as total_Consumables_in,
        SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END) as total_Consumables_out
        MAX(current_inventory) as current_stock,
        SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END) as total_stock_in,
        SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END) as total_stock_out
        FROM (
        SELECT
        product_model_id,
@@ -225,16 +225,16 @@
        SELECT
        product_model_id,
        0 as current_inventory,
        SUM(Consumables_in_num) as amount,
        SUM(stock_in_num) as amount,
        'in' as record_type
        FROM Consumables_in_record
        FROM consumables_in_record
        <where>
            type = 0
            <if test="ew.startMonth != null">
                and Consumables_in_record.create_time &gt;= #{ew.startMonth}
                and consumables_in_record.create_time &gt;= #{ew.startMonth}
            </if>
            <if test="ew.endMonth != null">
                and Consumables_in_record.create_time &lt;= #{ew.endMonth}
                and consumables_in_record.create_time &lt;= #{ew.endMonth}
            </if>
        </where>
        GROUP BY product_model_id
@@ -244,16 +244,16 @@
        SELECT
        product_model_id,
        0 as current_inventory,
        SUM(Consumables_out_num) as amount,
        SUM(stock_out_num) as amount,
        'out' as record_type
        FROM Consumables_out_record
        FROM consumables_out_record
        <where>
            type = 0
            <if test="ew.startMonth != null">
                and Consumables_out_record.create_time &gt;= #{ew.startMonth}
                and consumables_out_record.create_time &gt;= #{ew.startMonth}
            </if>
            <if test="ew.endMonth != null">
                and Consumables_out_record.create_time &lt;= #{ew.endMonth}
                and consumables_out_record.create_time &lt;= #{ew.endMonth}
            </if>
        </where>
        GROUP BY product_model_id
@@ -300,7 +300,7 @@

    <select id="selectDailyConsumablesInCounts" resultType="java.util.Map">
        SELECT DATE(sir.create_time) AS date,
               SUM(sir.Consumables_in_num) AS count
               SUM(sir.stock_in_num) AS count
        FROM consumables_in_record sir
                 JOIN product_model pm ON sir.product_model_id = pm.id
                 JOIN product p ON pm.product_id = p.id
@@ -313,7 +313,7 @@

    <select id="selectDailyConsumablesOutCounts" resultType="java.util.Map">
        SELECT DATE(sor.create_time)  AS date,
               SUM(sor.Consumables_out_num) AS count
               SUM(sor.stock_out_num) AS count
        FROM consumables_out_record sor
                 JOIN product_model pm ON sor.product_model_id = pm.id
                 JOIN product p ON pm.product_id = p.id