From fbda2f16d63dcad15de13ab0997ef51257e5815b Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 10:53:52 +0800
Subject: [PATCH] feat: 更新定时任务调度逻辑，支持启用状态下重新调度任务
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 5235958..4340a52 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -32,7 +32,9 @@
T2.nick_name AS entry_person_name,
T1.payment_method,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- T1.delivery_status AS deliveryStatus
+ T1.delivery_status AS deliveryStatus,
+ T1.label_print_count AS labelPrintCount,
+ T1.document_print_count AS documentPrintCount
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -70,7 +72,11 @@
T1.review_status AS reviewStatus,
T1.counter_review_time AS counterReviewTime,
T1.counter_review_person AS counterReviewPerson,
- T1.counter_review_person_id AS counterReviewPersonId
+ T1.counter_review_person_id AS counterReviewPersonId,
+ T1.counter_review_type AS counterReviewType,
+ T1.counter_review_desc AS counterReviewDesc,
+ T1.label_print_count AS labelPrintCount,
+ T1.document_print_count AS documentPrintCount
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
<where>
@@ -111,6 +117,7 @@
OR T1.review_status IS NULL
)
</if>
+
<if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
AND EXISTS (
SELECT 1
@@ -141,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
@@ -150,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