From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 6bb1899..913f73b 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">
@@ -49,7 +56,7 @@
SELECT
CASE
WHEN
- product_inventory_num > #{saleNum} THEN
+ product_inventory_num >= #{saleNum} THEN
TRUE ELSE FALSE
END result
FROM
@@ -67,4 +74,19 @@
<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>
</mapper>
--
Gitblit v1.9.3