From f6d1aedb785753f1d9343d8749fb5f025818903e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 16 七月 2026 17:50:58 +0800
Subject: [PATCH] feat: 销售台账添加编号倒序
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index c145e0a..ed6c26c 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -95,7 +95,7 @@
AND T1.entry_date <= 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 +110,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,
--
Gitblit v1.9.3