From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 3c8f870..e8e28a8 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -54,7 +54,7 @@
t1.create_time as createTime,
t1.update_time as updateTime,
t1.create_by as createBy,
- t2.warn_num as warnNum,
+ ifnull(t1.warn_num, t2.warn_num) as warnNum,
t1.out_stock_quantity as outStockQuantity,
t1.shortage_description as shortageDescription
from procurement_record_storage t1
@@ -69,6 +69,9 @@
</if>
<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>
@@ -129,8 +132,8 @@
max(t1.create_time) as create_time,
max(t1.update_time) as update_time,
t1.create_by,
- t2.warn_num
- from procurement_record_storage t1
+ ifnull(t1.warn_num, t2.warn_num) as warnNum
+ 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
left join product_model t4 on t4.id = t1.product_model_id
--
Gitblit v1.9.3