From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index c145e0a..6f368b2 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -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,
@@ -132,10 +134,12 @@
from sales_ledger sl
left join purchase_ledger pl on sl.id = pl.sales_ledger_id
left join customer c on sl.customer_id = c.id
- where 1=1
- <if test="customerName != null and customerName != '' ">
- and c.customer_name like concat('%',#{customerName},'%')
- </if>
+ <where>
+ <if test="customerName != null and customerName != '' ">
+ and c.customer_name like concat('%',#{customerName},'%')
+ </if>
+ </where>
+ order by sl.entry_date desc
</select>
</mapper>
--
Gitblit v1.9.3