From 8b36859fbe464c43fbfb8b2e8ef9ba4327d2d041 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 09 Sep 2022 09:40:35 +0800
Subject: [PATCH] 加工记录删除报错修复
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 f0156dc..fc2c821 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -24,27 +24,39 @@
from sys_process_inv inv
LEFT JOIN sys_machining m ON m.id = inv.product_id
LEFT JOIN sys_strain strain ON strain.id = inv.strain_id
+ LEFT JOIN sys_farm_product_stock fps ON inv.fps_id = fps.id
+ LEFT JOIN sys_land land ON land.id = fps.land_id
where inv.is_deleted = 0
- <if test="processInv.farmId != null and processInv.farmId != ''">
- AND inv.farm_id = #{processInv.farmId}
+ <if test="processInv.fpsId != null and processInv.fpsId != ''">
+ AND inv.fps_id = #{processInv.fpsId}
+ </if>
+ <if test="processInv.farmId != null and processInv.farmId !=''">
+ AND land.farm_id = #{processInv.farmId}
</if>
</select>
- <select id="selectBy2Id" resultType="org.springblade.modules.processInv.entity.ProcessInv">
+ <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 strain_id = #{strainId} AND product_id = #{productId}
+ FROM sys_process_inv
+ 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 fps_id = #{fpsId}
</select>
<insert id="add">
- INSERT INTO sys_process_inv (strain_id,product_id,product_inventory_num,create_time,status,is_deleted)
- VALUES (#{processInv.strainId},#{processInv.productId},#{processInv.productInventoryNum},NOW(),1,0)
+ INSERT INTO sys_process_inv (strain_id,product_id,product_inventory_num,create_time,status,is_deleted,fps_id)
+ VALUES (#{processInv.strainId},#{processInv.productId},#{processInv.productInventoryNum},NOW(),1,0,#{processInv.fpsId})
</insert>
<select id="stockCompare" resultType="java.lang.Boolean">
SELECT
CASE
WHEN
- product_inventory_num > #{saleNum} THEN
+ product_inventory_num >= #{saleNum} THEN
TRUE ELSE FALSE
END result
FROM
@@ -62,4 +74,33 @@
<delete id="del">
DELETE FROM sys_process_inv WHERE id = #{id}
</delete>
+
+ <select id="getLand" resultType="org.springblade.modules.processInv.vo.ProcessInvVO">
+ SELECT inv.id,inv.fps_id,fps.land_id
+ FROM sys_process_inv inv
+ LEFT JOIN sys_farm_product_stock fps ON inv.fps_id = fps.id
+ WHERE inv.is_deleted = 0
+ <if test="processInv.id != null and processInv.id != ''">
+ 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