From a67543042803ec4ea9b875f0ead049dae7720a8f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 三月 2026 10:50:43 +0800
Subject: [PATCH] 发货库存校验1.0

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index e367bc8..5655267 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,
@@ -34,19 +35,23 @@
         t2.product_category,
         t1.id,
         t1.sales_ledger_product_id,
+        t1.product_model_id,
         t1.create_user,
         t2.specification_model,
         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,
         t1.create_time,
         t1.update_time,
-        t1.create_by
+        t1.create_by,
+        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
@@ -54,6 +59,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,11 +104,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
@@ -108,6 +118,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 &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -125,6 +138,7 @@
                 and t1.create_time &lt;= #{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
@@ -152,4 +166,4 @@
                   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
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3