From 6306a1daa9e4ae06d6e14752bfd70f8fbbf85510 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 16:19:38 +0800
Subject: [PATCH] 1.新增调休审核枚举
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 202de6b..76b2664 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -100,9 +100,11 @@
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
+ sl.sales_contract_no,
+ sl.master_contract_no
FROM stock_out_record sor
left join shipping_info s on sor.record_id = s.id
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
@@ -116,6 +118,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