feat(customer): 添加客户银行代码字段并实现批量删除功能

liyong

2026-05-15 0578c6c76f13e367b5dc7d0882efe3c69ca4cb0e

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

@@ -6,12 +6,16 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.stock.pojo.StockInventory">
        <result column="id" property="id"/>
        <result column="product_model_id" property="productModelId"/>
        <result column="batch_no" property="batchNo"/>
        <result column="qualitity" property="qualitity"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="version" property="version"/>
        <result column="locked_quantity" property="lockedQuantity"/>
        <result column="warn_num" property="warnNum"/>
        <result column="remark" property="remark"/>
        <result column="locked" property="locked"/>
        <result column="warehouse_info_id" property="warehouseInfoId"/>
    </resultMap>
    <update id="updateAddStockInventory">
        update stock_inventory
@@ -34,6 +38,12 @@
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId}
            <if test="ew.warehouseInfoId == null">
                and warehouse_info_id is null
            </if>
            <if test="ew.warehouseInfoId != null">
                and warehouse_info_id = #{ew.warehouseInfoId}
            </if>
            <if test="ew.batchNo == null">
                and batch_no is null
            </if>
@@ -56,6 +66,12 @@
            update_time = now()
        </set>
        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
            <if test="ew.warehouseInfoId == null">
                and warehouse_info_id is null
            </if>
            <if test="ew.warehouseInfoId != null">
                and warehouse_info_id = #{ew.warehouseInfoId}
            </if>
            <if test="ew.batchNo == null">
                and batch_no is null
            </if>
@@ -66,12 +82,12 @@
    <update id="updateLocked">
        update stock_inventory
        set locked = #{locked}
        where product_model_id = #{ew.productModelId}
        where product_model_id = #{productModelId}
        <if test="batchNo == null">
            and batch_no is null
        </if>
            <if test="batchNo != null">
                and batch_no = #{ew.batchNo}
                and batch_no = #{batchNo}
            </if>
    </update>
    <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -79,6 +95,7 @@
        si.qualitity,
        COALESCE(si.locked_quantity, 0) as locked_quantity,
        si.product_model_id,
        si.warehouse_info_id,
        si.create_time,
        si.update_time,
        COALESCE(si.warn_num, 0) as warn_num,
@@ -87,10 +104,12 @@
        pm.model,
        si.remark,
        pm.unit,
        p.product_name
        p.product_name,
        siw.warehouse_name
        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 stock_warehouse_info siw on si.warehouse_info_id = siw.id
        where 1 = 1
        <if test="ew.productName != null and ew.productName !=''">
            and p.product_name like concat('%',#{ew.productName},'%')
@@ -122,6 +141,8 @@
            SUM(IFNULL(qualifiedPendingOut, 0)) as qualifiedPendingOutQuantity,
            SUM(IFNULL(unQualifiedPendingOut, 0)) as unQualifiedPendingOutQuantity,
            product_model_id,
            warehouse_info_id,
            warehouse_name,
            MAX(create_time) as create_time,
            MAX(update_time) as update_time,
            MAX(warn_num) as warn_num,
@@ -143,6 +164,8 @@
            COALESCE(si.locked_quantity, 0) as qualifiedLockedQuantity,
            0 as unQualifiedLockedQuantity,
            si.product_model_id,
            si.warehouse_info_id,
            siw.warehouse_name,
            si.create_time,
            si.update_time,
            COALESCE(si.warn_num, 0) as warn_num,
@@ -157,6 +180,7 @@
                select IFNULL(SUM(sor.stock_out_num), 0)
                from stock_out_record sor
                where sor.product_model_id = si.product_model_id
                  and sor.warehouse_info_id = si.warehouse_info_id
                  and (si.batch_no is null and sor.batch_no is null or si.batch_no = sor.batch_no)
                  and sor.type = '0'
                  and sor.approval_status = 0
@@ -165,6 +189,7 @@
            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 stock_warehouse_info siw on si.warehouse_info_id = siw.id

            union all

@@ -178,6 +203,8 @@
            0 as qualifiedLockedQuantity,
            COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,
            su.product_model_id,
            su.warehouse_info_id,
            siw.warehouse_name,
            su.create_time,
            su.update_time,
            0 as warn_num,
@@ -200,6 +227,7 @@
            from stock_uninventory su
            left join product_model pm on su.product_model_id = pm.id
            left join product p on pm.product_id = p.id
            left join stock_warehouse_info siw on su.warehouse_info_id = siw.id
        ) as combined
        <where>
            <if test="ew.productName != null and ew.productName !=''">
@@ -214,7 +242,7 @@
                and combined.product_id in (select id from product_tree)
            </if>
        </where>
        group by batch_no, product_model_id, model, unit, product_name, product_id
        group by batch_no, product_model_id, warehouse_info_id, warehouse_name, model, unit, product_name, product_id
    </select>

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -230,54 +258,104 @@
        INNER JOIN product_tree pt ON p.parent_id = pt.id
        )
        select
            SUM(qualifiedQuantity) as qualifiedQuantity,
            SUM(unQualifiedQuantity) as unQualifiedQuantity,
            SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
            SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
            model,
            unit,
            product_name,
            MAX(warn_num) as warn_num,
            MAX(remark) as remark,
            MAX(update_time) as update_time
        batch_no,
        MAX(qualifiedId) as qualifiedId,
        MAX(unQualifiedId) as unQualifiedId,
        SUM(qualifiedQuantity) as qualifiedQuantity,
        SUM(unQualifiedQuantity) as unQualifiedQuantity,
        SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
        SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
        SUM(qualifiedQuantity - qualifiedLockedQuantity - IFNULL(qualifiedPendingOut, 0)) as qualifiedUnLockedQuantity,
        SUM(unQualifiedQuantity - unQualifiedLockedQuantity - IFNULL(unQualifiedPendingOut, 0)) as unQualifiedUnLockedQuantity,
        SUM(IFNULL(qualifiedPendingOut, 0)) as qualifiedPendingOutQuantity,
        SUM(IFNULL(unQualifiedPendingOut, 0)) as unQualifiedPendingOutQuantity,
        product_model_id,
        warehouse_info_id,
        warehouse_name,
        MAX(create_time) as create_time,
        MAX(update_time) as update_time,
        MAX(warn_num) as warn_num,
        MAX(version) as version,
        model,
        MAX(remark) as remark,
        unit,
        product_name,
        product_id,
        'combined' as stockType
        from (
            select
            si.qualitity as qualifiedQuantity,
            0 as unQualifiedQuantity,
            COALESCE(si.locked_quantity, 0) as qualifiedLockedQuantity,
            0 as unQualifiedLockedQuantity,
            si.product_model_id,
            si.create_time,
            si.update_time,
            COALESCE(si.warn_num, 0) as warn_num,
            si.remark,
            pm.model,
            pm.unit,
            p.product_name,
            p.id as product_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
        select
        si.batch_no,
        si.id as qualifiedId,
        null as unQualifiedId,
        si.qualitity as qualifiedQuantity,
        0 as unQualifiedQuantity,
        COALESCE(si.locked_quantity, 0) as locked_quantity,
        COALESCE(si.locked_quantity, 0) as qualifiedLockedQuantity,
        0 as unQualifiedLockedQuantity,
        si.product_model_id,
        si.warehouse_info_id,
        siw.warehouse_name,
        si.create_time,
        si.update_time,
        COALESCE(si.warn_num, 0) as warn_num,
        si.version,
        (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
        pm.model,
        si.remark,
        pm.unit,
        p.product_name,
        p.id as product_id,
        (
        select IFNULL(SUM(sor.stock_out_num), 0)
        from stock_out_record sor
        where sor.product_model_id = si.product_model_id
        and sor.warehouse_info_id = si.warehouse_info_id
        and (si.batch_no is null and sor.batch_no is null or si.batch_no = sor.batch_no)
        and sor.type = '0'
        and sor.approval_status = 0
        ) as qualifiedPendingOut,
        0 as unqualifiedPendingOut
        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 stock_warehouse_info siw on si.warehouse_info_id = siw.id

            union all
        union all

            select
            0 as qualifiedQuantity,
            su.qualitity as unQualifiedQuantity,
            0 as qualifiedLockedQuantity,
            COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,
            su.product_model_id,
            su.create_time,
            su.update_time,
            0 as warn_num,
            su.remark,
            pm.model,
            pm.unit,
            p.product_name,
            p.id as product_id
            from stock_uninventory su
            left join product_model pm on su.product_model_id = pm.id
            left join product p on pm.product_id = p.id
        select
        su.batch_no,
        null as qualifiedId,
        su.id as unQualifiedId,
        0 as qualifiedQuantity,
        su.qualitity as unQualifiedQuantity,
        COALESCE(su.locked_quantity, 0) as locked_quantity,
        0 as qualifiedLockedQuantity,
        COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,
        su.product_model_id,
        null as warehouse_info_id,
        null as warehouse_name,
        su.create_time,
        su.update_time,
        0 as warn_num,
        su.version,
        (su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
        pm.model,
        su.remark,
        pm.unit,
        p.product_name,
        p.id as product_id,
        0 as qualifiedPendingOut,
        (
        select IFNULL(SUM(sor.stock_out_num), 0)
        from stock_out_record sor
        where sor.product_model_id = su.product_model_id
        and (su.batch_no is null and sor.batch_no is null or su.batch_no = sor.batch_no)
        and sor.type = '1'
        and sor.approval_status = 0
        ) as unqualifiedPendingOut
        from stock_uninventory su
        left join product_model pm on su.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        ) as combined
        <where>
            <if test="ew.productName != null and ew.productName !=''">
@@ -292,7 +370,7 @@
                and combined.product_id in (select id from product_tree)
            </if>
        </where>
        group by product_model_id, model, unit, product_name
        group by batch_no, product_model_id, warehouse_info_id, warehouse_name, model, unit, product_name, product_id
    </select>
    <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
        select sir.*,si.qualitity as current_stock,
@@ -303,6 +381,8 @@
        from
        stock_in_record sir
        left join stock_inventory si on sir.product_model_id = si.product_model_id
            and (sir.batch_no = si.batch_no or (sir.batch_no is null and si.batch_no is null))
            and sir.warehouse_info_id = si.warehouse_info_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
@@ -445,9 +525,10 @@
        SELECT IFNULL(SUM(sor.stock_out_num), 0)
        FROM stock_out_record sor
        WHERE sor.product_model_id = #{productModelId}
          AND sor.warehouse_info_id = #{warehouseInfoId}
          AND (sor.batch_no = #{batchNo} OR (#{batchNo} IS NULL AND sor.batch_no IS NULL))
          AND sor.type = #{type}
          AND sor.approval_status = 0
          AND sor.approval_status IN (0, 3)
    </select>

    <select id="listSelectableBatchNoByProductModelIds" resultType="com.ruoyi.stock.pojo.StockInventory">
@@ -464,17 +545,30 @@
        order by si.product_model_id, si.batch_no
    </select>
    <select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
        select spd.id, spd.batch_no, spd.locked_quantity, (spd.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
        from stock_inventory spd
                 left join (select stock_inventory_id, sum(quantity) as qualitity
                            from shipping_product_detail
                            group by stock_inventory_id) as sd on sd.stock_inventory_id = spd.id
        where product_model_id = #{productModelId}
        select si.id, si.batch_no, si.locked_quantity, si.warehouse_info_id, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
        from stock_inventory si
                 left join (
                    select spd.stock_inventory_id, sum(spd.quantity) as qualitity
                    from shipping_product_detail spd
                    where exists (
                        select 1
                        from stock_out_record sor
                        where sor.record_id = spd.shipping_info_id
                          and sor.record_type = '13'
                          and sor.type = '0'
                          and sor.approval_status in (0, 3)
                          and sor.product_model_id = spd.product_model_id
                          and (sor.batch_no = spd.batch_no or (sor.batch_no is null and spd.batch_no is null))
                    )
                    group by spd.stock_inventory_id
                 ) as sd on sd.stock_inventory_id = si.id
        where si.product_model_id = #{productModelId}
    </select>
    <select id="selectStockInvenrory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
        select spd.id, spd.batch_no,pm.model,pm.unit,p.product_name, spd.qualitity,spd.product_model_id
        select spd.id, spd.batch_no, spd.warehouse_info_id, siw.warehouse_name, pm.model, pm.unit, p.product_name, spd.qualitity, spd.product_model_id
        from stock_inventory spd
            left join product_model pm on pm.id = spd.product_model_id
        left join stock_warehouse_info siw on siw.id = spd.warehouse_info_id
        left join product_model pm on pm.id = spd.product_model_id
        left join product p on p.id = pm.product_id
        where product_model_id = #{productModelId}
    </select>
@@ -487,7 +581,7 @@
        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
        where 1 = 1 and si.locked = 0
        <if test="ew.productName != null and ew.productName !=''">
            and p.product_name like concat('%',#{ew.productName},'%')
        </if>
@@ -499,6 +593,14 @@
        pm.unit,
        p.product_name
    </select>
    <select id="existsUsed" resultType="java.lang.Long">
        select count(1)
        from stock_inventory
        where warehouse_info_id in
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </select>


</mapper>