From 8e3ba001aef38baff8a8d9435fabaf0071a9661a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 31 三月 2026 13:25:34 +0800
Subject: [PATCH] fix: 供应商名称去除手动新增
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 174 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 95 insertions(+), 79 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 426f665..88efdf6 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -34,19 +34,20 @@
t3.supplier_name,
t3.purchase_contract_number,
case when t2.product_category is null then t5.product_name
- else t2.product_category end as productCategory,
+ else t2.product_category end as productCategory,
t1.id,
t1.sales_ledger_product_id,
t1.product_model_id,
t1.create_user,
case when t2.specification_model is null then t4.model
- else t2.specification_model end as specificationModel,
+ else t2.specification_model end as specificationModel,
case when t2.unit is null then t4.unit
- else t2.unit end as 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,
- (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
+ (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate /
+ 100) as taxExclusiveTotalPrice,
t1.inbound_batches,
t1.inbound_num,
t1.inbound_num as inboundNum0,
@@ -56,11 +57,11 @@
t2.warn_num,
t1.out_stock_quantity as outStockQuantity,
t1.shortage_description as shortageDescription
- 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
+ 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 != ''">
@@ -72,60 +73,63 @@
</where>
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- case when t2.product_category is null then t5.product_name
- else t2.product_category end as productCategory,
- t1.id,
- 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,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- 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 t3.supplier_name,
+ t3.purchase_contract_number,
+ case
+ when t2.product_category is null then t5.product_name
+ else t2.product_category end as productCategory,
+ t1.id,
+ 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,
+ t2.tax_inclusive_unit_price,
+ t2.tax_inclusive_total_price,
+ t2.tax_exclusive_total_price,
+ t1.inbound_batches,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_time as time,
+ t1.create_by
+ 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.supplier_name as supplierName,
t3.purchase_contract_number,
case when t2.product_category is null then t5.product_name
- else t2.product_category end as productCategory,
- t1.id,
+ else t2.product_category end as productCategory,
+ max(t1.id) as id,
t1.sales_ledger_product_id,
t1.create_user,
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,
+ 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,
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
- t1.inbound_batches,
+ group_concat(t1.inbound_batches) as inbound_batches,
sum(t1.inbound_num) as inboundNum,
sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
- t1.create_time,
- t1.update_time,
+ sum(t1.inbound_num) as totalInboundNum,
+ max(t1.create_time) as create_time,
+ max(t1.update_time) as update_time,
t1.create_by,
t2.warn_num
- from procurement_record_storage 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
left join product_model t4 on t4.id = t1.product_model_id
@@ -133,13 +137,14 @@
<where>
1 = 1
<if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
+ and t3.supplier_name like concat('%',#{req.supplierName},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
<if test="req.reportDate != null">
- and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
+ and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1
+ DAY)
</if>
<if test="req.startMonth != null">
and t1.create_time >= #{req.startMonth}
@@ -154,38 +159,49 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t3.supplier_name,t2.product_category,t2.specification_model
+ group by
+ t3.supplier_name,
+ t3.purchase_contract_number,
+ productCategory,
+ specificationModel,
+ unit
+ order by
+ (t3.supplier_name IS NULL) DESC,
+ t3.supplier_name ASC
</select>
+
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- 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,
- 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,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_time as cTime,
- t1.update_time as uTime,
- t1.create_by
- 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 t3.supplier_name,
+ t3.purchase_contract_number,
+ 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,
+ 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,
+ t2.tax_exclusive_total_price,
+ t1.inbound_batches,
+ t1.inbound_num,
+ t1.inbound_num as inboundNum0,
+ t1.create_time,
+ t1.update_time,
+ t1.create_time as cTime,
+ t1.update_time as uTime,
+ t1.create_by
+ 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