From 67c684d08724c01684465107ac763e513a7da906 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 30 十月 2025 16:56:58 +0800
Subject: [PATCH] yys 1.接口文档

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 7d0f59b..74e6ae5 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -11,6 +11,7 @@
             t2.specification_model,
             t2.unit,
             t2.quantity,
+            t2.min_stock,
             t2.quantity as quantity0,
             t2.tax_rate,
             t2.tax_inclusive_unit_price,
@@ -38,8 +39,8 @@
         t2.unit,
         t2.tax_rate,
         t2.tax_inclusive_unit_price,
-        t2.tax_inclusive_total_price,
-        t2.tax_exclusive_total_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_batches,
         t1.inbound_num,
         t1.inbound_num as inboundNum0,
@@ -89,6 +90,7 @@
         t1.create_user,
         t2.specification_model,
         t2.unit,
+        t2.min_stock,
         t2.tax_rate,
         t2.tax_inclusive_unit_price,
         t2.tax_inclusive_total_price,
@@ -96,6 +98,7 @@
         t1.inbound_batches,
         t1.inbound_num,
         t1.inbound_num as inboundNum0,
+        t1.inbound_num as totalInboundNum,
         t1.create_time,
         t1.update_time,
         t1.create_by
@@ -107,6 +110,21 @@
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
             </if>
+            <if test="req.reportDate != null">
+                and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
+            </if>
+            <if test="req.startMonth != null">
+                and t1.create_time >= #{req.startMonth}
+            </if>
+            <if test="req.endMonth != null">
+                and t1.create_time &lt;= #{req.endMonth}
+            </if>
+            <if test="req.startDate != null">
+                and t1.create_time >= #{req.startDate}
+            </if>
+            <if test="req.endDate != null">
+                and t1.create_time &lt;= #{req.endDate}
+            </if>
         </where>
     </select>
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">

--
Gitblit v1.9.3