From ea66f8ba50bd32589cab54dc67cb49bed728c1e7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 10 十二月 2025 11:38:57 +0800
Subject: [PATCH] yys 修改bug
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index d7799dc..c66cf09 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -61,6 +61,7 @@
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
@@ -162,6 +163,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 +188,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 +217,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
@@ -252,6 +256,7 @@
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
@@ -304,6 +309,7 @@
and t1.create_time <= #{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