From b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 17:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 830b0d9..9330aac 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -17,10 +17,13 @@
t1.inbound_num,
t1.create_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t4.unit_price,
+ t4.unit_price * t1.inbound_num as totalPrice
from procurement_record_out 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_storage t4 on t4.id = t1.procurement_record_storage_id
<where>
and t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -113,10 +116,13 @@
t2.tax_exclusive_total_price,
t1.inbound_num,
t1.create_time,
- t1.create_by
+ t1.create_by,
+ t4.unit_price,
+ t4.unit_price * t1.inbound_num as totalPrice
from procurement_record_out t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
+ left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
<where>
and t1.type = 2
<if test="req.customerName != null and req.customerName != ''">
@@ -141,11 +147,12 @@
t2.unit,
t2.tax_rate,
t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
+ t2.tax_inclusive_unit_price * t1.inbound_num as totalPrice,
t2.tax_exclusive_total_price,
t1.inbound_num,
t1.create_time,
- t1.create_by
+ t1.create_by,
+ t2.item_type
from procurement_record_out t1
left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
<where>
--
Gitblit v1.9.3