From 2fe3fbf034a6d4bc58ae20ebf7aba2cf230dafa1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 24 八月 2026 14:20:37 +0800
Subject: [PATCH] ``` feat(staff): 完善员工在职信息管理功能
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 202de6b..ae93650 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -89,7 +89,7 @@
and sor.record_type = #{params.recordType}
</if>
</where>
- order by sor.id desc
+ order by sor.outbound_batches desc
</select>
<select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
@@ -100,6 +100,7 @@
sor.create_time as shippingDate,
p.product_name,
pm.model as specification_model,
+ slp.tax_rate,
sor.stock_out_num * slp.tax_inclusive_unit_price as outboundAmount,
s.shipping_no,
sl.sales_contract_no
@@ -116,6 +117,9 @@
<if test="req.customerName != null and req.customerName != ''">
AND sl.customer_name LIKE CONCAT('%',#{req.customerName},'%')
</if>
+ <if test="req.customerId != null ">
+ AND sl.customer_id = #{req.customerId}
+ </if>
<if test="req.startDate != null and req.endDate != null">
AND s.shipping_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
--
Gitblit v1.9.3