From b43cffab6311b377628528a2e1c8b3eae14b676d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 01 六月 2026 12:31:59 +0800
Subject: [PATCH] 供应商往来和采购台账查询库存数据优化

---
 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..33e42ec 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -62,7 +62,7 @@
                 and p.id in (select id from product_tree)
             </if>
         </where>
-        order by sor.id desc
+        order by sor.create_time desc
     </select>
     <select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
         SELECT
@@ -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