From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml b/src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
index ba0e289..ffce0ba 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>
@@ -22,7 +23,28 @@
</if>
</where>
group by t1.product_category, t1.specification_model, t1.tax_inclusive_unit_price
- 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
+ <where>
+ <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
order by t1.inbound_date desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3