From eefcdefe106d2da0c2c9a09ea788ce0164984fff Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 25 六月 2026 15:59:02 +0800
Subject: [PATCH] fix: 发货台账排序根据发货编号倒序
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index b2d6781..4340a52 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -33,7 +33,6 @@
T1.payment_method,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
T1.delivery_status AS deliveryStatus,
- T1.order_status AS orderStatus,
T1.label_print_count AS labelPrintCount,
T1.document_print_count AS documentPrintCount
FROM
@@ -76,7 +75,6 @@
T1.counter_review_person_id AS counterReviewPersonId,
T1.counter_review_type AS counterReviewType,
T1.counter_review_desc AS counterReviewDesc,
- T1.order_status AS orderStatus,
T1.label_print_count AS labelPrintCount,
T1.document_print_count AS documentPrintCount
FROM sales_ledger T1
@@ -119,9 +117,7 @@
OR T1.review_status IS NULL
)
</if>
- <if test="salesLedgerDto.orderStatus != null">
- AND T1.order_status = #{salesLedgerDto.orderStatus}
- </if>
+
<if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
AND EXISTS (
SELECT 1
@@ -152,6 +148,7 @@
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
@@ -161,6 +158,9 @@
<if test="ew.customerName != null and ew.customerName != '' ">
and sl.customer_name like concat('%',#{ew.customerName},'%')
</if>
+ <if test="ew.salesContractNo != null and ew.salesContractNo != '' ">
+ and sl.sales_contract_no like concat('%',#{ew.salesContractNo},'%')
+ </if>
order by sl.execution_date desc
</select>
--
Gitblit v1.9.3