From 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18 Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 09:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim-qiao
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index d5f8046..cf76a56 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -19,7 +19,7 @@
t3.inbound_num as quantityStock
from purchase_ledger t1
left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
- left join procurement_record t3 on t2.id = t3.sales_ledger_product_id
+ left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
where t1.purchase_contract_number = #{req.purchaseContractNumber}
<if test="req.id != null and req.id != ''">
and t3.id = #{req.id}
@@ -32,19 +32,19 @@
t3.purchase_contract_number,
t2.product_category,
t1.id,
+ t1.sales_ledger_product_id,
t2.specification_model,
t2.unit,
- t2.quantity,
- t2.quantity as quantity0,
t2.tax_rate,
t2.tax_inclusive_unit_price,
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_batches,
t1.inbound_num,
+ t1.inbound_num as inboundNum0,
t1.create_date,
t1.create_by
- from procurement_record t1
+ from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
<where>
@@ -72,7 +72,7 @@
t1.inbound_num,
t1.create_date,
t1.create_by
- from procurement_record t1
+ from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
</select>
--
Gitblit v1.9.3