From 64027e45c5b0d9dfe1a5536f30ca9183af24b456 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 13 一月 2026 11:01:06 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 6119edd..f739bec 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -137,6 +137,7 @@
         sum(t1.total_price) as totalPrice,
         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,
@@ -171,7 +172,7 @@
                 and t1.create_time &lt;= #{req.endDate}
             </if>
         </where>
-        group by t2.product_category,t2.specification_model,t1.unit_price
+        group by t3.supplier_name,t2.product_category,t2.specification_model,t1.unit_price
         order by t1.create_time desc
     </select>
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
@@ -254,7 +255,8 @@
         t1.create_time,
         t1.update_time,
         t1.create_by,
-        t2.warn_num
+        t2.warn_num,
+        t2.product_id
         from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
         left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -296,7 +298,8 @@
         t1.create_time,
         t1.update_time,
         t1.create_by,
-        t2.warn_num
+        t2.warn_num,
+        t2.product_id
         from  procurement_record_storage t1
         left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
         left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -310,6 +313,9 @@
             </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
+            </if>
+            <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+                and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
             </if>
             <if test="req.reportDate != null">
                 and t1.create_time >= #{req.reportDate} and t1.create_time &lt; DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -330,4 +336,9 @@
         group by t2.product_category,t2.specification_model,t1.unit_price
         order by t1.create_time desc
     </select>
+    <select id="listPagePRS" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
+        select *
+        from  procurement_record_storage t1
+        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3