From 8e14fa84f6f2dfdda8a739400fca80ac73dca874 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 25 十二月 2025 11:06:21 +0800
Subject: [PATCH] yys 修改项目利润，供应商往来
---
src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
index ba0e289..40d1d5d 100644
--- a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
@@ -4,13 +4,14 @@
<select id="listPageCopyByCustom" resultType="com.ruoyi.procurementrecord.pojo.CustomStorage">
select t1.*,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- sum(t1.tax_inclusive_total_price) as taxInclusiveTotalPrice,
- SUM(t1.inbound_num) - COALESCE(SUM(t2.inbound_num), 0) AS availableStock
+ sum(t1.tax_inclusive_total_price) as totalPrice,
+ sum(t1.inbound_num) as inboundNum,
+ sum(t1.inbound_num) as inboundNum0,
+ SUM(t1.inbound_num) - COALESCE(SUM(t2.inbound_num), 0) AS availableStock
from custom_storage t1
left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3
<where>
+ t2.type = 3
<if test="req.productCategory != null and req.productCategory != ''">
and t1.product_category like concat('%',#{req.productCategory},'%')
</if>
@@ -25,4 +26,30 @@
HAVING availableStock > 0
order by t1.inbound_date desc
</select>
+ <select id="listPageByCustom" resultType="com.ruoyi.procurementrecord.pojo.CustomStorage">
+ select t1.*,
+ sum(t1.inbound_num) as inboundNum,
+ sum(t1.inbound_num) as inboundNum0,
+ sum(t1.tax_inclusive_total_price) as taxInclusiveTotalPrice,
+ (t1.inbound_num - COALESCE(SUM(t2.inbound_num), 0)) AS availableStock
+ from custom_storage t1
+ left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3
+ <where>
+ t2.type = 3
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t1.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.supplierName !=null and req.supplierName != ''">
+ and t1.supplier_name like concat('%',#{req.supplierName},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.inbound_date 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.inbound_date desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3