From 9d9928e3a79c202c1718f7fec7c154090627eaba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 10:45:16 +0800
Subject: [PATCH] 农资管理添加农场过滤条件，修复出入库记录表删除回滚问题
---
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index 9f1cf3b..e7abe23 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -54,7 +54,10 @@
AND blade_dict_biz.tenant_id = #{stock.codes}
</if>) a ON
a.dict_key = stf.type
- WHERE st.is_deleted = 0 and state=0
+ WHERE st.is_deleted = 0 and state=0 AND st.amount != 0
+ <if test="stock.deptId !=null and stock.deptId !=''">
+ and st.dept_id = #{stock.deptId}
+ </if>
<if test="stock.stype!=null and stock.stype != ''">
and stf.type = #{stock.stype}
</if>
--
Gitblit v1.9.3