From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 8861c9c..d01b62a 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -50,7 +50,8 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t1.is_frozen
from procurement_record_storage t1
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
@@ -141,7 +142,8 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t1.is_frozen
from procurement_record_storage t1
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
@@ -256,7 +258,8 @@
t1.update_time,
t1.create_by,
t2.warn_num,
- t2.product_id
+ t2.product_id,
+ t1.is_frozen
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
@@ -353,17 +356,20 @@
</if>
</where>
</select>
- <select id="getSumQuantity" resultType="BigDecimal">
+
+ <select id="getSumQuantity" resultType="java.math.BigDecimal">
select COALESCE(sum(inbound_num), 0)
from procurement_record_storage
- where product_model_id = #{productModelId}
+ where product_model_id = #{productModelId} and is_frozen = false
</select>
+
<select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
t1.*,
- t2.model as product_category ,
+ t1.inbound_num as inboundNum0,
+ t2.model as specification_model ,
t2.unit,
- t3.product_name
+ t3.product_name as product_category
from procurement_record_storage t1
left join product_model t2 on t1.product_model_id = t2.id
left join product t3 on t2.product_id = t3.id
--
Gitblit v1.9.3