Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

 src/main/resources/mapper/production/SalesLedgerWorkMapper.xml

@@ -2,7 +2,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.SalesLedgerWorkMapper">

    <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerWorkDto">
    <select id="listPage" resultType="com.ruoyi.production2.dto.SalesLedgerWorkDto">
        SELECT
        t4.id,
        t4.status,
@@ -13,17 +13,23 @@
        t4.finished_num,
        t4.work_hours,
        t4.process,
        t4.type,
        t4.remark,
        t4.receive,
        T1.sales_contract_no,
        T1.customer_contract_no,
        T1.project_name,
        T1.customer_name,
        t3.product_category,
        t3.specification_model,
        t3.unit
        t3.unit,
        t2.speculative_trading_name,
        t4.production_line
        FROM
        sales_ledger_work t4
        LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
        left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id and slp.type = 1
        left join sales_ledger_scheduling t2 on t4.sales_ledger_scheduling_id = t2.id
        <where>
            t3.type = 1
            <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
@@ -48,6 +54,6 @@
                AND  t4.scheduling_date &lt;= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
            </if>
        </where>
        order by t4.update_time desc
        order by t4.scheduling_date desc
    </select>
</mapper>