fix: 添加规格型号搜索

liding

2 天以前 e5cc807a611a078b1c152731ff7a07e765bbb9a5

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

@@ -14,8 +14,11 @@
        <result column="warn_num" property="warnNum"/>
    </resultMap>
    <update id="updateAddConsumablesInventory">
        update Consumables_inventory
        update consumables_inventory
        <set>
            <if test="ew.productId != null">
                product_id = #{ew.productId},
            </if>
            <if test="ew.qualitity != null">
                qualitity = qualitity + #{ew.qualitity},
            </if>
@@ -37,10 +40,10 @@
        where product_model_id = #{ew.productModelId}
    </update>
    <update id="updateSubtractConsumablesInventory">
        update Consumables_inventory
        update consumables_inventory
        <set>
            <if test="ew.netWeight != null">
                qualitity = qualitity - #{ew.netWeight},
                qualitity = qualitity - #{ew.qualitity},
            </if>
            <if test="ew.version != null">
                version = version + 1,
@@ -54,59 +57,66 @@
    </update>

    <select id="pageConsumablesInventory" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
        select
        SELECT * FROM (
        SELECT
        si.id,
        -- 当前净重 = 入库净重 - 出库净重
        (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
        si.qualitity,
        COALESCE(si.locked_quantity, 0) as locked_quantity,
        (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS qualitity,
        si.purchaser,
        COALESCE(si.locked_quantity, 0) AS locked_quantity,
        si.product_model_id,
        si.create_time,
        si.update_time,
        COALESCE(si.warn_num, 0) as warn_num,
        COALESCE(si.warn_num, 0) AS warn_num,
        si.version,
        (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
        (si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
        pm.model,
        si.remark,
        pm.unit,
        p.product_name,
        p1.product_name as parent_name,
        p1.id as parent_id

        from Consumables_inventory si
        left join product_model pm on si.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        left join product p1 on p.parent_id = p1.id
        p1.product_name AS parent_name,
        p1.id AS parent_id,
        si.product_id AS productId
        FROM consumables_inventory si
        LEFT JOIN product_model pm ON si.product_model_id = pm.id
        LEFT JOIN product p ON pm.product_id = p.id
        LEFT JOIN product p1 ON p.parent_id = p1.id
        -- 入库净重
        left join (
        select
        LEFT JOIN (
        SELECT
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_in_record
        group by product_model_id
        ) sir on si.product_model_id = sir.product_model_id
        SUM(stock_in_num) AS total_net_weight
        FROM consumables_in_record
        GROUP BY product_model_id
        ) sir ON si.product_model_id = sir.product_model_id
        -- 出库净重
        left join (
        select
        LEFT JOIN (
        SELECT
        product_model_id,
        sum(net_weight) as total_net_weight
        from Consumables_out_record
        group by product_model_id
        ) sor on si.product_model_id = sor.product_model_id

        SUM(stock_out_num) AS total_net_weight
        FROM consumables_out_record
        GROUP BY product_model_id
        ) sor ON si.product_model_id = sor.product_model_id
        <where>
            1=1
            <if test="ew.parentId != null and ew.parentId !=''">
                and p.parent_id = #{ew.parentId}
            <if test="ew.parentId != null and ew.parentId != ''">
                AND p.parent_id = #{ew.parentId}
            </if>
            <if test="ew.productName != null and ew.productName !=''">
                and p.product_name like concat('%',#{ew.productName},'%')
            <if test="ew.productName != null and ew.productName != ''">
                AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
            </if>
            <if test="ew.model != null and ew.model != ''">
                AND pm.model LIKE CONCAT('%', #{ew.model}, '%')
            </if>
        </where>
        ) temp
        WHERE qualitity != 0
    </select>

    <select id="listConsumablesInventoryExportData" resultType="com.ruoyi.consumables.execl.ConsumablesInventoryExportData">
        select si.qualitity,
        -- 当前净重 = 入库净重 - 出库净重
        (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
        pm.model,
        pm.unit,
        p.product_name,
@@ -114,19 +124,34 @@
        coalesce(si.locked_quantity, 0) as locked_quantity,
        si.remark,
        si.update_time
        from Consumables_inventory si
        from consumables_inventory si
        left join product_model pm on si.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        left join (
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from consumables_in_record
        group by product_model_id
        ) sir on si.product_model_id = sir.product_model_id
        -- 出库净重
        left join (
        select
        product_model_id,
        sum(net_weight) as total_net_weight
        from consumables_out_record
        group by product_model_id
        ) sor on si.product_model_id = sor.product_model_id
        where 1 = 1
        <if test="ew.productName != null and ew.productName !=''">
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
    </select>

    <select id="ConsumablesInventoryPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
    <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,
@@ -135,9 +160,9 @@
        -- 当前净重 = 入库净重 - 出库净重
        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
        left join consumables_inventory si
        on sir.product_model_id = si.product_model_id

        left join product_model pm
@@ -154,7 +179,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
@@ -164,12 +189,13 @@
        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

        <where>
            1=1
            <if test="ew.reportDate != null">
                and sir.create_time >= #{ew.reportDate}
                and sir.create_time &lt; DATE_ADD(#{ew.reportDate}, INTERVAL 1 DAY)
@@ -183,21 +209,22 @@
        </where>
    </select>

    <select id="ConsumablesInAndOutRecord" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
    <select id="consumablesInAndOutRecord" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
        SELECT
        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,
        (COALESCE(in_weight.total_net_weight, 0) - COALESCE(out_weight.total_net_weight, 0)) AS current_weight
        FROM (
        SELECT
        product_model_id,
        SUM(qualitity) as current_inventory,
        0 as amount,
        '' as record_type
        FROM Consumables_inventory
        FROM consumables_inventory
        GROUP BY product_model_id

        UNION ALL
@@ -205,16 +232,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
@@ -224,23 +251,58 @@
        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
        ) combined_data
        -- 左连接入库净重合计
        LEFT JOIN (
        SELECT
        product_model_id,
        SUM(net_weight) AS total_net_weight
        FROM consumables_in_record
        <where>
            type = 0
            <if test="ew.startMonth != null">
                and create_time &gt;= #{ew.startMonth}
            </if>
            <if test="ew.endMonth != null">
                and create_time &lt;= #{ew.endMonth}
            </if>
        </where>
        GROUP BY product_model_id
        ) in_weight ON combined_data.product_model_id = in_weight.product_model_id
        -- 左连接出库净重合计
        LEFT JOIN (
        SELECT
        product_model_id,
        SUM(net_weight) AS total_net_weight
        FROM consumables_out_record
        <where>
            type = 0
            <if test="ew.startMonth != null">
                and create_time &gt;= #{ew.startMonth}
            </if>
            <if test="ew.endMonth != null">
                and create_time &lt;= #{ew.endMonth}
            </if>
        </where>
        GROUP BY product_model_id
        ) out_weight ON combined_data.product_model_id = out_weight.product_model_id
        LEFT JOIN product_model pm ON pm.id = combined_data.product_model_id
        LEFT JOIN product p ON p.id = pm.product_id
        <where>
            1=1
            <if test="ew.productName != null and ew.productName !=''">
                and p.product_name like concat('%',#{ew.productName},'%')
            </if>
@@ -280,7 +342,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
@@ -293,7 +355,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