From 17cfbc75dc326f3e5963ee17c99d6516497f8cf1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 f67f9c9..913f73b 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -56,7 +56,7 @@
SELECT
CASE
WHEN
- product_inventory_num > #{saleNum} THEN
+ product_inventory_num >= #{saleNum} THEN
TRUE ELSE FALSE
END result
FROM
@@ -74,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