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/farmplant/mapper/FarmProductStockMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 6fd13c1..89e7661 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -390,6 +390,7 @@
         select sfps.strain_id strainId,sfps.weight,ss.url,ss.strain_name strainName from
         sys_farm_product_stock sfps
         left join sys_strain ss on ss.id = sfps.strain_id
+        LEFT JOIN sys_land land ON land.id = sfps.land_id
         where 1=1
         <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
             and sfps.strain_id = #{farmProductStock.strainId}
@@ -412,6 +413,9 @@
         <if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
             and ss.strain_type = #{farmProductStock.strainType}
         </if>
+        <if test="farmProductStock.farmId !=null and farmProductStock.farmId !='' ">
+            and land.farm_id = #{farmProductStock.farmId}
+        </if>
     </select>
 
     <!--销售对比库存是否充足-->

--
Gitblit v1.9.3