From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index a001e9a..b7c9a1f 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -22,7 +22,8 @@
SELECT
pro.*,
sm.supplier_name as supplier_name,
- pl.purchase_contract_number as purchase_contract_number
+ pl.purchase_contract_number as purchase_contract_number,
+ pl.master_contract_no as master_contract_no
FROM purchase_return_orders pro
LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
@@ -54,7 +55,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,
@@ -62,7 +63,8 @@
pro.prepared_at,
pro.total_amount,
CASE pro.return_type WHEN 0 THEN '閫�璐ч��娆�' WHEN 1 THEN '鎷掓敹' END AS returnType,
- pl.purchase_contract_number
+ pl.purchase_contract_number,
+ pl.master_contract_no
from purchase_return_orders pro
left join
(select prop.purchase_return_order_id,
@@ -75,6 +77,9 @@
where 1=1
<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},'%')
@@ -132,7 +137,7 @@
slp.tax_inclusive_unit_price,
prop.return_quantity,
prop.purchase_return_order_id,
- GREATEST(sir.stock_in_num - COALESCE(prop.return_quantity, 0), 0) AS un_quantity,
+ GREATEST(sir.stock_in_num - COALESCE(rs1.total_return_num1, 0), 0) AS un_quantity,
COALESCE(rs.total_return_num, 0) AS total_return_num
from purchase_return_order_products prop
left join purchase_return_orders pro on prop.purchase_return_order_id = pro.id
@@ -143,6 +148,11 @@
FROM purchase_return_order_products
WHERE 1 = 1 and purchase_return_order_id = #{id}
GROUP BY stock_in_record_id) rs ON rs.stock_in_record_id = sir.id
+ LEFT JOIN (SELECT stock_in_record_id,
+ SUM(return_quantity) AS total_return_num1
+ FROM purchase_return_order_products
+ WHERE 1 = 1 and purchase_return_order_id = #{id}
+ GROUP BY stock_in_record_id) rs1 ON rs1.stock_in_record_id = sir.id
where pro.id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3