From b701cf0331e91900bf8055009a745d4953a6c510 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 17:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 697bae1..426f665 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -33,13 +33,16 @@
select
t3.supplier_name,
t3.purchase_contract_number,
- t2.product_category,
+ case when t2.product_category is null then t5.product_name
+ else t2.product_category end as productCategory,
t1.id,
t1.sales_ledger_product_id,
t1.product_model_id,
t1.create_user,
- t2.specification_model,
- t2.unit,
+ case when t2.specification_model is null then t4.model
+ else t2.specification_model end as specificationModel,
+ case when t2.unit is null then t4.unit
+ else t2.unit end as unit,
t2.tax_rate,
t2.tax_inclusive_unit_price,
(t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
@@ -56,6 +59,8 @@
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
+ left join product_model t4 on t4.id = t1.product_model_id
+ left join product t5 on t5.id = t4.product_id
<where>
1 = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -70,10 +75,13 @@
select
t3.supplier_name,
t3.purchase_contract_number,
- t2.product_category,
+ case when t2.product_category is null then t5.product_name
+ else t2.product_category end as productCategory,
t1.id,
- t2.specification_model,
- t2.unit,
+ case when t2.specification_model is null then t4.model
+ else t2.specification_model end as specificationModel,
+ case when t2.unit is null then t4.unit
+ else t2.unit end as unit,
t2.quantity,
t2.quantity as quantity0,
t2.tax_rate,
@@ -88,17 +96,22 @@
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
+ left join product_model t4 on t4.id = t1.product_model_id
+ left join product t5 on t5.id = t4.product_id
</select>
<select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
t3.supplier_name,
t3.purchase_contract_number,
- t2.product_category,
+ case when t2.product_category is null then t5.product_name
+ else t2.product_category end as productCategory,
t1.id,
t1.sales_ledger_product_id,
t1.create_user,
- t2.specification_model,
- t2.unit,
+ case when t2.specification_model is null then t4.model
+ else t2.specification_model end as specificationModel,
+ case when t2.unit is null then t4.unit
+ else t2.unit end as unit,
t2.min_stock,
t2.tax_rate,
t2.tax_inclusive_unit_price,
@@ -115,6 +128,8 @@
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
+ left join product_model t4 on t4.id = t1.product_model_id
+ left join product t5 on t5.id = t4.product_id
<where>
1 = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -145,12 +160,15 @@
select
t3.supplier_name,
t3.purchase_contract_number,
- t2.product_category,
+ case when t2.product_category is null then t5.product_name
+ else t2.product_category end as productCategory,
t1.id,
t1.sales_ledger_product_id,
t1.create_user,
- t2.specification_model,
- t2.unit,
+ case when t2.specification_model is null then t4.model
+ else t2.specification_model end as specificationModel,
+ case when t2.unit is null then t4.unit
+ else t2.unit end as unit,
t2.tax_rate,
t2.tax_inclusive_unit_price,
t2.tax_inclusive_total_price,
@@ -166,6 +184,8 @@
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
+ left join product_model t4 on t4.id = t1.product_model_id
+ left join product t5 on t5.id = t4.product_id
</select>
<select id="getSumQuantity" resultType="BigDecimal">
select COALESCE(sum(inbound_num), 0)
--
Gitblit v1.9.3