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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 712fd9b..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
@@ -137,7 +142,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