fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除

liding

2026-03-23 cf65d0a608b21f07dc50a98b864dfe47def4f86b

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -60,8 +60,7 @@
        SELECT
        si.id,
        -- 当前净重 = 入库净重 - 出库净重
        (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS net_weight,
        si.qualitity,
        (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS qualitity,
        COALESCE(si.locked_quantity, 0) AS locked_quantity,
        si.product_model_id,
        si.create_time,
@@ -102,6 +101,8 @@

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
        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,
@@ -112,6 +113,16 @@
        from stock_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 stock_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 stock_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},'%')
@@ -185,7 +196,8 @@
        p.product_name,
        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
        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,
@@ -233,6 +245,42 @@
        </where>
        GROUP BY product_model_id
        ) combined_data

        -- 左连接入库净重合计
        LEFT JOIN (
        SELECT
        product_model_id,
        SUM(net_weight) AS total_net_weight
        FROM stock_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 stock_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>
@@ -246,7 +294,9 @@
        GROUP BY
        pm.model,
        pm.unit,
        p.product_name
        p.product_name,
        in_weight.total_net_weight,
        out_weight.total_net_weight
    </select>
    <select id="selectTotal" resultType="java.math.BigDecimal">
        select ifnull(sum(qualitity), 0)