From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个，则需要展示多个
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index c145e0a..1e0748e 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -62,6 +62,7 @@
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
+ COALESCE(T1.stock_type, 'qualified') AS stock_type,
IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -93,6 +94,10 @@
</if>
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
+ </if>
+
+ <if test="salesLedgerDto.stockType != null and salesLedgerDto.stockType != '' ">
+ AND COALESCE(T1.stock_type, 'qualified') = #{salesLedgerDto.stockType}
</if>
</where>
order by T1.entry_date desc
@@ -132,10 +137,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