feat: 销售台账新增未/已发货

gongchunyi

2026-08-06 0c0aacce3755912bed0e576b209444411d54b5f7

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

@@ -88,6 +88,30 @@
            <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
                AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
            </if>
            <if test="salesLedgerDto.shippingStatus != null and salesLedgerDto.shippingStatus != '' ">
                AND T1.id IN (
                SELECT slp.sales_ledger_id
                FROM sales_ledger_product slp
                LEFT JOIN (
                SELECT si.sales_ledger_product_id, IFNULL(SUM(spd.quantity), 0) AS shipped_quantity
                FROM shipping_info si
                LEFT JOIN shipping_product_detail spd ON si.id = spd.shipping_info_id
                WHERE si.status != '审核拒绝'
                GROUP BY si.sales_ledger_product_id
                ) ship ON ship.sales_ledger_product_id = slp.id
                WHERE slp.type = 1
                GROUP BY slp.sales_ledger_id
                HAVING
                <choose>
                    <when test="'已发货'.equals(salesLedgerDto.shippingStatus)">
                        SUM(CASE WHEN IFNULL(slp.quantity, 0) - IFNULL(ship.shipped_quantity, 0) &gt; 0 THEN 1 ELSE 0 END) = 0
                    </when>
                    <otherwise>
                        SUM(CASE WHEN IFNULL(slp.quantity, 0) - IFNULL(ship.shipped_quantity, 0) &gt; 0 THEN 1 ELSE 0 END) &gt; 0
                    </otherwise>
                </choose>
                )
            </if>
            <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
                AND T1.entry_date &gt;= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
            </if>
@@ -95,7 +119,7 @@
                AND T1.entry_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by T1.entry_date desc
        order by T1.entry_date desc, T1.sales_contract_no desc
    </select>

    <select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
@@ -110,17 +134,19 @@
        FROM sales_ledger
        GROUP BY customer_name
    </select>

    <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
        select distinct sl.id as 'disId', sl.* from
        sales_ledger sl
        left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
        left join shipping_info si on slp.id = si.sales_ledger_product_id
        where si.status = '已发货'
        <if test="ew.customerName != null and ew.customerName != '' ">
            and sl.customer_name like concat('%',#{ew.customerName},'%')
        where si.status = '审核通过'
        <if test="ew.customerId != null and ew.customerId != '' ">
            and sl.customer_id = #{ew.customerId}
        </if>
        order by sl.execution_date desc
    </select>

    <select id="selectPurchaseReportVoPage" resultType="com.ruoyi.purchase.vo.PurchaseReportVo">
        select sl.sales_contract_no customerContractNo,
               c.customer_name,