From bda92029a58afb22c091d2ed3205bd5bc8590d93 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 10:22:46 +0800
Subject: [PATCH] 溯源地块去重
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
index f7f3e9b..fc2c821 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -38,13 +38,13 @@
<select id="selectBySPId" resultType="org.springblade.modules.processInv.entity.ProcessInv">
SELECT id,strain_id,product_id,product_inventory_num,create_time,update_user,update_time,status,is_deleted
FROM sys_process_inv
- WHERE is_deleted = 0 AND strain_id = #{strainId} AND product_id = #{productId}
+ WHERE is_deleted = 0 AND strain_id = #{strainId} AND product_id = #{productId} AND fps_id = #{fpsId}
</select>
<select id="selectBySFId" resultType="org.springblade.modules.processInv.entity.ProcessInv">
SELECT id,strain_id,product_id,product_inventory_num,create_time,update_user,update_time,status,is_deleted
FROM sys_process_inv
- WHERE is_deleted = 0 AND strain_id = #{strainId} AND product_id = #{fpsId}
+ WHERE is_deleted = 0 AND strain_id = #{strainId} AND fps_id = #{fpsId}
</select>
<insert id="add">
@@ -56,7 +56,7 @@
SELECT
CASE
WHEN
- product_inventory_num > #{saleNum} THEN
+ product_inventory_num >= #{saleNum} THEN
TRUE ELSE FALSE
END result
FROM
@@ -84,4 +84,23 @@
AND inv.id = #{processInv.id}
</if>
</select>
+ <select id="findById" resultType="org.springblade.modules.processInv.entity.ProcessInv">
+ SELECT id,strain_id,product_id,product_inventory_num,create_time,update_user,update_time,status,is_deleted
+ FROM sys_process_inv
+ WHERE is_deleted = 0 AND id = #{prodId}
+ </select>
+ <select id="statisticsStock" resultType="java.lang.Double">
+ SELECT SUM(inv.product_inventory_num) as sum
+ FROM sys_process_inv inv
+ LEFT JOIN sys_farm_product_stock sfps ON sfps.id = inv.fps_id
+ LEFT JOIN sys_land land ON land.id = sfps.land_id
+ WHERE 1=1 AND inv.is_deleted = 0
+ <if test="year!=null and year!=''">
+ and YEAR ( inv.create_time ) = #{year}
+ </if>
+ <if test="farmId!=null and farmId!=''">
+ and land.farm_id = #{farmId}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.3