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

maven

5 天以前 539624ef39177ebb6fd5577b83df7097dd6f4bec

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

@@ -23,11 +23,12 @@
        t3.product_category,
        t3.specification_model,
        t3.unit,
        t2.speculative_trading_name
        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
@@ -53,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>