From 6847fa93b9ecaec32da3763cb1da844bea1681dd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 25 六月 2026 14:38:06 +0800
Subject: [PATCH] fix: 1.发货车牌号展示多个 2.销售客户往来合同金额改成退货后金额
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 6732a66..2f782ff 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -54,7 +54,7 @@
where pro.id = #{id}
</select>
<select id="listPageAccountPurchaseReturn"
- resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo">
+ resultType="com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo">
select pro.id,
pro.no returnNo,
t.inboundBatches,
@@ -76,6 +76,9 @@
<if test="req.returnNo != null and req.returnNo != ''">
and pro.no like concat('%',#{req.returnNo},'%')
</if>
+ <if test="req.supplierId != null">
+ and pro.supplier_id = #{req.supplierId}
+ </if>
<if test="req.supplierName != null and req.supplierName != ''">
and sm.supplier_name like concat('%',#{req.supplierName},'%')
</if>
--
Gitblit v1.9.3