From 16338016e73791cecbbdbdd73e972b29a06c59b1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 15:24:50 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_新疆马铃薯pro
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 712fd9b..1cd3971 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -62,7 +62,8 @@
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
+ IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh,
+ T3.purchase_contract_number
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
LEFT JOIN (
@@ -74,6 +75,7 @@
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
+ LEFT JOIN purchase_ledger T3 ON T1.purchase_ledger_id = T3.id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
@@ -137,7 +139,7 @@
and c.customer_name like concat('%',#{customerName},'%')
</if>
</where>
- order by sl.create_time desc
+ order by sl.entry_date desc
</select>
</mapper>
--
Gitblit v1.9.3