From 1284fb157043e488aa1794d8f1b64ebf18aa5147 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index dd03d4d..8bb1831 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -55,7 +55,7 @@
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 1
+ left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type in (1, 5)
<where>
t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -151,9 +151,9 @@
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 1
+ left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type in (1, 5)
<where>
- t1.type = 1 and t4.type = 1
+ t1.type = 1 and t4.type in (1, 5)
<if test="req.supplierName != null and req.supplierName != ''">
and t3.supplier_name like concat('%',#{req.supplierName},'%')
</if>
--
Gitblit v1.9.3