From f3715712dc101a12a5d91e7231888fbc06452b8f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 18:42:52 +0800
Subject: [PATCH] fix: 库存出库空数据补全
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 1d99122..a80c23f 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -70,12 +70,15 @@
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
+ <if test="req.productModelId != null">
+ and t1.product_model_id = #{req.productModelId}
+ </if>
</where>
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select t3.supplier_name as supplierName,
- t3.purchase_contract_number as purchaseContractNumber,
+ select t3.supplier_name as supplierName,
+ t3.purchase_contract_number as purchaseContractNumber,
case
when t2.product_category is null then t5.product_name
else t2.product_category end as productCategory,
@@ -106,7 +109,7 @@
<select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
- t3.supplier_name,
+ t3.supplier_name as supplierName,
t3.purchase_contract_number,
case when t2.product_category is null then t5.product_name
else t2.product_category end as productCategory,
@@ -161,11 +164,14 @@
</if>
</where>
group by
- t3.supplier_name,
- t3.purchase_contract_number,
- productCategory,
- specificationModel,
- unit
+ t3.supplier_name,
+ t3.purchase_contract_number,
+ productCategory,
+ specificationModel,
+ unit
+ order by
+ (t3.supplier_name IS NULL) DESC,
+ t3.supplier_name ASC
</select>
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
--
Gitblit v1.9.3