yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接...

云

2026-03-21 7b2233d1dab53574facc66b3bebffcd8ca5919de

 src/main/resources/mapper/sales/ShippingInfoMapper.xml

@@ -20,15 +20,20 @@
        s.tenant_id,
        sl.sales_contract_no,
        sl.customer_name,
        s.shipping_total AS shipping_total
        s.shipping_total AS shipping_total,
        slp.id as salesLedgerProductId
        FROM shipping_info s
        LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
        LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
        WHERE 1=1
        <if test="req.salesContractNo != null and req.salesContractNo != ''">
            AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
        </if>
        <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
            AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
        </if>
        <if test="req.customerName != null and req.customerName != ''">
            AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
        </if>
        <if test="req.shippingNo != null and req.shippingNo != ''">
            AND s.shipping_no LIKE CONCAT('%',#{req.shippingNo},'%')
@@ -54,4 +59,63 @@
        FROM shipping_info s
                 LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
    </select>
    <select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
        select *,sid.id as id from shipping_info_detail sid
            left join shipping_info si on si.id = sid.shipping_info_id
                          left join sales_ledger sl on si.sales_ledger_id = sl.id
        where (si.status = '已发货' or si.status = '发货中')  and (sid.status is null or sid.status != '已退货') and sl.customer_name = #{customerName}
    </select>
    <select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
        SELECT
        slp.*,
        si.shipping_num,
        GREATEST(si.shipping_num - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
        COALESCE(rs.total_return_num, 0) AS total_return_num
        FROM shipping_info_detail si
        LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id and slp.type = 1
        LEFT JOIN (
        SELECT
        return_sale_ledger_product_id,
        SUM(num) AS total_return_num
        FROM return_sale_product rsp
        left join return_management rm on rm.id = rsp.return_management_id
        left join shipping_info_detail si on si.id = rm.shipping_id
        <where>
            <if test="shippingId != null">
                si.id = #{shippingId}
            </if>
        </where>
        GROUP BY si.id
        ) rs ON rs.return_sale_ledger_product_id = slp.id
        <where>
            <if test="shippingId != null">
                si.id = #{shippingId}
            </if>
        </where>
    </select>
    <select id="getDateil" resultType="com.ruoyi.sales.dto.ShippingInfoDto" parameterType="java.lang.Long">
        SELECT
            s.id,
            s.sales_ledger_id,
            s.shipping_date,
            s.shipping_car_number,
            s.express_number,
            s.express_company,
            s.shipping_no,
            s.type,
            s.status,
            s.create_time,
            s.update_time,
            s.create_user,
            s.update_user,
            s.tenant_id,
            sl.sales_contract_no,
            sl.customer_name,
            s.shipping_total AS shipping_total,
            slp.id as salesLedgerProductId
        FROM shipping_info s
                 LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
                 LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
        WHERE s.id = #{id}
    </select>
</mapper>