From cea9f0102b0855f33d62dd0de644d719352f16f3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:41:27 +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