From b95f5fb1af8a80ac03a8da8da3e863ad468bf477 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 13 九月 2025 14:58:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
index 44047a4..4b1c59c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml
@@ -131,6 +131,9 @@
LEFT JOIN t_crm_supplier t4 on t3.supplier_clinic_id = t4.id
LEFT JOIN t_erp_supplier_outbound_goods t5 on t5.warehousing_batch_id =t1.id
where t2.disabled = 0 and t2.warehouse_id = #{query.warehouseId}
+ <if test="query.type != null and query.type ==1">
+ and #{time} > t1.expiry_date
+ </if>
<if test="query.goodsName != null and query.goodsName != ''">
and t3.goods_name like concat('%',#{query.goodsName},'%')
</if>
--
Gitblit v1.7.1