From 26a8cbc31f2d739a91e3fa7e75114e360bcaee0d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 10:01:46 +0800
Subject: [PATCH] 发货信息返回产品名称，规格，单位
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index b4619d8..ad5976f 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -46,6 +46,12 @@
<if test="params.productName != null and params.productName != ''">
and p.product_name like concat('%',#{params.productName},'%')
</if>
+ <if test="params.model != null and params.model != ''">
+ and pm.model like concat('%',#{params.model},'%')
+ </if>
+ <if test="params.batchNo != null and params.batchNo != ''">
+ and sor.batch_no like concat('%',#{params.batchNo},'%')
+ </if>
<if test="params.type != null and params.type != ''">
and sor.type = #{params.type}
</if>
@@ -86,14 +92,15 @@
order by sor.id desc
</select>
- <select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.SalesOutboundVo">
+ <select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo">
SELECT
sor.id,
sor.outbound_batches,
sl.customer_name,
- s.shipping_date,
+ sor.create_time as shippingDate,
p.product_name,
- slp.specification_model,
+ 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
@@ -103,15 +110,18 @@
LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
left join product_model pm on slp.product_model_id = pm.id
left join product p on pm.product_id = p.id
- WHERE s.status='宸插彂璐�' and sor.record_type='13'
+ WHERE sor.record_type='13' and sor.approval_status=1
<if test="req.outboundBatches != null and req.outboundBatches != ''">
AND sor.outbound_batches LIKE CONCAT('%',#{req.outboundBatches},'%')
</if>
<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 #{startDate} AND #{endDate}
+ AND s.shipping_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
order by sor.id DESC
</select>
--
Gitblit v1.9.3