From 77f4df1a6f92be12aa0ee8597acbf094f8a88120 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 七月 2026 15:15:56 +0800
Subject: [PATCH] 采购台账：新增或编辑重复添加协调审批记录问题修复&编辑时添加产品报错问题修复
---
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index 961d783..a5314fd 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -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>
@@ -103,7 +106,10 @@
LEFT JOIN quality_inspect qi ON sir.record_type = 10 AND sir.record_id = qi.id
LEFT JOIN purchase_ledger pl
ON pl.id = IF(sir.record_type = 7, sir.record_id, qi.purchase_ledger_id)
- LEFT JOIN sales_ledger_product slp ON pl.id = slp.sales_ledger_id
+ LEFT JOIN sales_ledger_product slp
+ ON pl.id = slp.sales_ledger_id
+ AND slp.product_model_id = sir.product_model_id
+ AND slp.type = 2
LEFT JOIN (
SELECT
stock_in_record_id,
@@ -113,7 +119,7 @@
WHERE 1=1
GROUP BY stock_in_record_id
) rs ON rs.stock_in_record_id = sir.id
- WHERE sir.approval_status = 1 AND slp.type = 2
+ WHERE sir.approval_status = 1
AND sir.record_type IN ('7','10')
and pl.id = #{purchaseLedgerId}
</select>
--
Gitblit v1.9.3