From 336b3e06da854740d65037d65fe70b33b3f7ed62 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 16:16:27 +0800
Subject: [PATCH] yys 模板导出word
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 74e6ae5..c378c6a 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -12,6 +12,7 @@
t2.unit,
t2.quantity,
t2.min_stock,
+ t2.warn_num,
t2.quantity as quantity0,
t2.tax_rate,
t2.tax_inclusive_unit_price,
@@ -46,7 +47,8 @@
t1.inbound_num as inboundNum0,
t1.create_time,
t1.update_time,
- t1.create_by
+ t1.create_by,
+ t2.warn_num
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
@@ -54,6 +56,9 @@
1 = 1
<if test="req.supplierName != null and 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},'%')
</if>
</where>
</select>
@@ -96,12 +101,13 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
+ sum(t1.inbound_num) as inboundNum,
+ sum(t1.inbound_num) as inboundNum0,
t1.inbound_num as totalInboundNum,
t1.create_time,
t1.update_time,
- t1.create_by
+ t1.create_by,
+ t2.warn_num
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
@@ -109,6 +115,9 @@
1 = 1
<if test="req.supplierName != null and 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},'%')
</if>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -126,6 +135,7 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
+ group by t3.supplier_name,t2.product_category,t2.specification_model
</select>
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
--
Gitblit v1.9.3