feat: 出库台账、库存管理、原材料出库领用都添加净重显示

gongchunyi

21 小时以前 e3de4be3084d4fe159b5c928b749fbd5d01db25e

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

@@ -22,11 +22,15 @@
            <if test="ew.version != null">
                version = version + 1,
            </if>

            <if test="ew.remark != null and ew.remark !=''">
                remark = #{ew.remark},
            </if>
            <if test="ew.warnNum != null and ew.warnNum !=''">
                warn_num = #{ew.warnNum},
            </if>
            <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                locked_quantity = locked_quantity + #{ew.lockedQuantity},
            </if>
            update_time = now()
        </set>
@@ -48,8 +52,12 @@
        </set>
        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
    </update>

    <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
        select si.id,
        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,
        si.product_model_id,
@@ -59,21 +67,51 @@
        si.version,
        (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
        pm.model,
        si.remark,
        pm.unit,
        p.product_name
        p.product_name,
        p1.product_name as parent_name,
        p1.id as parent_id

        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
        where 1 = 1
        <if test="ew.productName != null and ew.productName !=''">
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
        left join product p1 on p.parent_id = p1.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.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>
        </where>
    </select>

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
        select si.qualitity,
        pm.model,
        pm.unit,
        p.product_name,
        coalesce(si.warn_num, 0) as warn_num,
        coalesce(si.locked_quantity, 0) as locked_quantity,
        si.remark,
        si.update_time
        from stock_inventory si
@@ -84,16 +122,53 @@
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
    </select>

    <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
        select sir.*,si.qualitity,
        select
        sir.*,
        si.qualitity as current_stock,
        pm.model,
        pm.unit,
        p.product_name
        from
        stock_in_record sir
        left join stock_inventory si on sir.product_model_id = si.product_model_id
        left join product_model pm on sir.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        p.product_name,
        su.nick_name as create_by,

        -- 当前净重 = 入库净重 - 出库净重
        IFNULL(inWeight.total_in_weight,0) - IFNULL(outWeight.total_out_weight,0) as current_weight

        from stock_in_record sir

        left join stock_inventory si
        on sir.product_model_id = si.product_model_id

        left join product_model pm
        on sir.product_model_id = pm.id

        left join product p
        on pm.product_id = p.id

        left join sys_user su
        on sir.create_user = su.user_id

        -- 入库净重统计
        left join (
        select
        product_model_id,
        sum(net_weight) as total_in_weight
        from stock_in_record
        group by product_model_id
        ) inWeight
        on sir.product_model_id = inWeight.product_model_id

        -- 出库净重统计
        left join (
        select
        product_model_id,
        sum(net_weight) as total_out_weight
        from stock_out_record
        group by product_model_id
        ) outWeight
        on sir.product_model_id = outWeight.product_model_id

        <where>
            <if test="ew.reportDate != null">
                and sir.create_time >= #{ew.reportDate}
@@ -178,5 +253,55 @@
        pm.unit,
        p.product_name
    </select>
    <select id="selectTotal" resultType="java.math.BigDecimal">
        select ifnull(sum(qualitity), 0)
        from stock_inventory
    </select>

    <select id="selectTotalByDate" resultType="java.math.BigDecimal">
        select IFNULL(sum(qualitity), 0)
        from stock_inventory
        where create_time &gt;= #{now}
          and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
    </select>

    <select id="selectStorageProductCountByDate" resultType="int">
        SELECT SUM(total_count)
        FROM (SELECT COUNT(*) as total_count
              FROM stock_inventory
              WHERE create_time &gt;= #{startDate}
                AND create_time &lt;= #{endDate}
              UNION ALL
              SELECT COUNT(*) as total_count
              FROM stock_uninventory
              WHERE create_time &gt;= #{startDate}
                AND create_time &lt;= #{endDate}) AS combined_counts
    </select>

    <select id="selectDailyStockInCounts" resultType="java.util.Map">
        SELECT DATE(sir.create_time) AS date,
               SUM(sir.stock_in_num) AS count
        FROM stock_in_record sir
                 JOIN product_model pm ON sir.product_model_id = pm.id
                 JOIN product p ON pm.product_id = p.id
        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
          AND sir.create_time &gt;= #{startDate}
          AND sir.create_time &lt;= #{endDate}
        GROUP BY DATE(sir.create_time)
        ORDER BY DATE(sir.create_time) ASC
    </select>

    <select id="selectDailyStockOutCounts" resultType="java.util.Map">
        SELECT DATE(sor.create_time)  AS date,
               SUM(sor.stock_out_num) AS count
        FROM stock_out_record sor
                 JOIN product_model pm ON sor.product_model_id = pm.id
                 JOIN product p ON pm.product_id = p.id
        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
          AND sor.create_time &gt;= #{startDate}
          AND sor.create_time &lt;= #{endDate}
        GROUP BY DATE(sor.create_time)
        ORDER BY DATE(sor.create_time) ASC
    </select>

</mapper>