From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index e8c6788..5235958 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -55,6 +55,7 @@
T1.customer_name,
T1.entry_person,
T1.remarks,
+ T1.customer_remarks,
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
@@ -65,7 +66,11 @@
T1.delivery_date,
T1.stock_status,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- T1.delivery_status AS deliveryStatus
+ T1.delivery_status AS deliveryStatus,
+ T1.review_status AS reviewStatus,
+ T1.counter_review_time AS counterReviewTime,
+ T1.counter_review_person AS counterReviewPerson,
+ T1.counter_review_person_id AS counterReviewPersonId
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
<where>
@@ -94,8 +99,34 @@
<if test="salesLedgerDto.stockStatus != null">
AND T1.stock_status = #{salesLedgerDto.stockStatus}
</if>
+ <if test="salesLedgerDto.reviewStatus != null">
+ AND T1.review_status = #{salesLedgerDto.reviewStatus}
+ </if>
+ <if test="salesLedgerDto.reviewStatusList != null and salesLedgerDto.reviewStatusList.size() > 0">
+ AND (
+ T1.review_status IN
+ <foreach collection="salesLedgerDto.reviewStatusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
+ OR T1.review_status IS NULL
+ )
+ </if>
+ <if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
+ AND EXISTS (
+ SELECT 1
+ FROM sales_ledger_product SLP
+ WHERE SLP.sales_ledger_id = T1.id
+ AND SLP.type = 1
+ <if test="salesLedgerDto.width != null">
+ AND SLP.width = #{salesLedgerDto.width}
+ </if>
+ <if test="salesLedgerDto.height != null">
+ AND SLP.height = #{salesLedgerDto.height}
+ </if>
+ )
+ </if>
</where>
- ORDER BY T1.entry_date DESC
+ ORDER BY T1.entry_date DESC,T1.id DESC
</select>
<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
--
Gitblit v1.9.3