From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录，修复当农资库存为1时出库再退回，农资库存数据有误
---
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index a113764..dee7705 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -80,12 +80,18 @@
LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1
WHERE st.is_deleted = 0
+ <if test="stockrecord.agrname!=null and stockrecord.agrname != ''">
+ and f.agricultural_name like concat ('%',#{stockrecord.agrname},'%')
+ </if>
<if test="stockrecord.stype!=null and stockrecord.stype != ''">
and stf.type = #{stockrecord.stype}
</if>
<if test="stockrecord.sid!=null and stockrecord.sid != ''">
and st.sid = #{stockrecord.sid}
</if>
+ <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
+ and st.dept_id = #{stockrecord.deptId}
+ </if>
ORDER BY st.create_time desc
</select>
--
Gitblit v1.9.3