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/soldr/mapper/SoldrMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
index 9262c12..58af5da 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -37,7 +37,8 @@
a.dict_value AS stype,
d.dict_value AS dic1,
c.dict_value AS dic2,
- stf.agricultural_name as agrname
+ stf.agricultural_name as agrname,
+ st.dept_id
FROM sys_soldr st
LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
LEFT JOIN (SELECT dict_key, dict_value
@@ -61,6 +62,9 @@
</if>
<if test="soldr.stockId1!=null and soldr.stockId1 != ''">
and st.stock_id1 = #{soldr.stockId1}
+ </if>
+ <if test="soldr.deptId != null and soldr.deptId !=''">
+ AND st.dept_id = #{soldr.deptId}
</if>
</select>
@@ -103,6 +107,9 @@
WHERE CODE = 'stockType' AND is_deleted = 0) a ON
a.dict_key = stf.type
WHERE st.is_deleted = 0
+ <if test="farmId != null and farmId !=''">
+ AND st.dept_id = #{farmId}
+ </if>
</select>
<!--查询是否存在已出库农资-->
--
Gitblit v1.9.3