From e43a488b51555d87a4225bfb7dfc93b8f0e95a39 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 13:21:41 +0800
Subject: [PATCH] yys  采购，销售删除修改

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

diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index d7799dc..093f4e5 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -57,10 +57,14 @@
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
             </if>
+            <if test="req.productCategory != null and req.productCategory != ''">
+                and t2.product_category like  concat('%',#{req.productCategory},'%')
+            </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
         </where>
+        order by t1.create_time desc
     </select>
     <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
         select
@@ -142,6 +146,9 @@
             <if test="req.supplierName != null and req.supplierName != ''">
                 and t3.supplier_name like  concat('%',#{req.supplierName},'%')
             </if>
+            <if test="req.productCategory != null and req.productCategory != ''">
+                and t2.product_category like  concat('%',#{req.productCategory},'%')
+            </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
@@ -162,6 +169,7 @@
             </if>
         </where>
         group by t3.supplier_name,t2.product_category,t2.specification_model
+        order by t1.create_time desc
     </select>
     <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
@@ -186,9 +194,10 @@
             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 sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
                   left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
         where t1.type = 1
+        group by t3.supplier_name,t2.product_category,t2.specification_model
     </select>
     <select id="listCopyOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
@@ -214,9 +223,10 @@
             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 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
         where t1.type = 2
+        group by t3.customer_name,t2.product_category,t2.specification_model
     </select>
     <select id="listPageByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
         select
@@ -248,10 +258,14 @@
             <if test="req.customerName != null and req.customerName != ''">
                 and t3.customer_name like  concat('%',#{req.customerName},'%')
             </if>
+            <if test="req.productCategory != null and req.productCategory != ''">
+                and t2.product_category like  concat('%',#{req.productCategory},'%')
+            </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
         </where>
+        order by t1.create_time desc
     </select>
     <select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
         select
@@ -285,6 +299,9 @@
             <if test="req.customerName != null and req.customerName != ''">
                 and t3.customer_name like  concat('%',#{req.customerName},'%')
             </if>
+            <if test="req.productCategory != null and req.productCategory != ''">
+                and t2.product_category like  concat('%',#{req.productCategory},'%')
+            </if>
             <if test="req.timeStr != null and req.timeStr != ''">
                 and t1.create_time like  concat('%',#{req.timeStr},'%')
             </if>
@@ -304,6 +321,7 @@
                 and t1.create_time &lt;= #{req.endDate}
             </if>
         </where>
-        group by t3.customer_name,t2.product_category,t2.specification_model
+        group by t2.product_category,t2.specification_model
+        order by t1.create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3