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/stock/mapper/StockMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 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..b4824f9 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>
@@ -134,7 +137,7 @@
<!--入库出库-->
<update id="Updaet">
update sys_stock
- set amount = #{stock.amount}
+ set amount = #{stock.amount},state = #{stock.state}
where id = #{stock.id}
</update>
--
Gitblit v1.9.3