From 28c5f0a46761b5490932b095abed43a26fc4ba60 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:52:27 +0800
Subject: [PATCH] 加工产品库存新添加农产品库存主键，查询时加工产品时新增农场过滤
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..6bb1899 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -24,9 +24,14 @@
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>
@@ -36,8 +41,8 @@
</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