From cea9f0102b0855f33d62dd0de644d719352f16f3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:41:27 +0800
Subject: [PATCH] 修复不同农场的同种农产品加工后会替换掉另一个加工后产品的数据

---
 src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 6bb1899..f67f9c9 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -35,9 +35,16 @@
         </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">

--
Gitblit v1.9.3