From ddaad70562d53c68ad80f221755d0ab985da3dee Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 20:20:11 +0800
Subject: [PATCH] yys 修改项目利率
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 0d28ecd..177e1c3 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -50,10 +50,12 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ SUM(t1.inbound_num) - COALESCE(SUM(t4.inbound_num), 0) AS availableStock
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
+ left join procurement_record_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 1
<where>
t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -66,6 +68,10 @@
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
+ group by t1.id
+ <if test="req.flag != null and req.flag">
+ having availableStock > 0
+ </if>
order by t1.create_time desc
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
@@ -257,10 +263,12 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ SUM(t1.inbound_num) - COALESCE(SUM(t4.inbound_num), 0) AS availableStock
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
+ left join procurement_record_out t4 on t4.procurement_record_storage_id = t1.id and t1.type = 2
<where>
t1.type = 2
<if test="req.customerName != null and req.customerName != ''">
@@ -273,6 +281,10 @@
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
+ group by t1.id
+ <if test="req.flag != null and req.flag">
+ having availableStock > 0
+ </if>
order by t1.create_time desc
</select>
<select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
--
Gitblit v1.9.3