From fc6f694cbc5c8d4f98bb98c51b87b4d73ac98885 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 03 Aug 2022 09:13:54 +0800
Subject: [PATCH] 首页种养品种总和保留三位小数,详情接口和种养品种接口分离

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 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 7742614..4fdd274 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -63,6 +63,13 @@
         group by sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
     </select>
 
+    <!--根据农场id和品种类型查询  关系:农产品库存表关联地块 -》 地块关联农场 -》 需要联合查询    -->
+    <select id="findFarmProductStockByFarmIdAndStrainId" resultType="org.springblade.modules.farmplant.entity.FarmProductStock">
+        select a.* from sys_farm_product_stock a
+        left join sys_land b on a.land_id = b.id
+        where 1=1 and a.strain_id = #{strainId} and b.farm_id = #{farmId}
+    </select>
+
 
     <!--查询农产品库存数据-->
     <select id="statisticsProduct" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
@@ -357,6 +364,9 @@
         <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
             and sfps.tenant_id = #{farmProductStock.tenantId}
         </if>
+        <if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
+            and ss.strain_type = #{farmProductStock.strainType}
+        </if>
     </select>
 
     <!--销售对比库存是否充足-->
@@ -372,10 +382,17 @@
         WHERE
             id = #{id}
     </select>
+
     <!--减去对应库存-->
     <update id="stockReduce">
         UPDATE sys_farm_product_stock SET weight = weight - #{sale}
         WHERE
             id = #{id}
     </update>
+
+    <select id="selectBy2Id" resultType="org.springblade.modules.farmplant.entity.FarmProductStock">
+        SELECT id,strain_id,weight,leaves,time,operator,remark,
+               create_time,farm_plant_id,dept_id,tenant_id,recovery,land_id
+        FROM sys_farm_product_stock  WHERE strain_id = #{strainId} AND land_id = #{landId}
+    </select>
 </mapper>

--
Gitblit v1.9.3