fix:1.生产报工优化

liding

2026-05-20 4d99e718536ac77dff26dde8da7a59cdc9b52de8

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

@@ -31,6 +31,7 @@
        T1.execution_date,
        T2.nick_name AS entry_person_name,
        T1.payment_method,
        T1.is_produce AS produce,
        DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff
        FROM
        sales_ledger T1
@@ -42,7 +43,7 @@
        </where>
    </select>

    <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
    <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
        SELECT T1.id,
        T1.sales_contract_no,
        T1.customer_contract_no,
@@ -51,6 +52,10 @@
        T1.salesman,
        T1.customer_id,
        T1.customer_name,
        T3.company_address,
        T3.contact_phone,
        T3.contact_person,
        T3.company_phone,
        T1.entry_person,
        T1.remarks,
        T1.attachment_materials,
@@ -60,8 +65,12 @@
        T1.execution_date,
        T2.nick_name                          AS entry_person_name,
        T1.payment_method,
        T1.is_produce AS produce,
        T1.delivery_date,
        DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
        product_summary.model,
        '' AS voltage,
        product_summary.qty,
        CASE
        WHEN shipping_status_counts.total_count = 0 THEN false
        WHEN shipping_status_counts.unshipped_count = 0 THEN true
@@ -69,6 +78,7 @@
        END AS is_fh
        FROM sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
        LEFT JOIN customer T3 ON T1.customer_id = T3.id
        LEFT JOIN (
        SELECT sales_ledger_id,
        COUNT(*) as total_count,
@@ -76,6 +86,15 @@
        FROM shipping_info
        GROUP BY sales_ledger_id
        ) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
        LEFT JOIN (
        SELECT
        sales_ledger_id,
        GROUP_CONCAT(IFNULL(specification_model, '') ORDER BY id SEPARATOR ',') AS model,
        GROUP_CONCAT(IFNULL(CAST(quantity AS CHAR), '') ORDER BY id SEPARATOR ',') AS qty
        FROM sales_ledger_product
        WHERE type = 1
        GROUP BY sales_ledger_id
        ) product_summary ON T1.id = product_summary.sales_ledger_id
        <where>
            <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                AND  T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
@@ -111,4 +130,4 @@
        FROM sales_ledger
        GROUP BY customer_name
    </select>
</mapper>
</mapper>