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/processInv/mapper/ProcessInvMapper.xml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..f67f9c9 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -24,20 +24,32 @@
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}
+ </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}
</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">
--
Gitblit v1.9.3