From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
index 2efadae..dcdc2d3 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -3,16 +3,24 @@
<mapper namespace="org.springblade.modules.InventoryLoss.mapper.InventoryMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="inventoryResultMap" type="org.springblade.modules.InventoryLoss.entity.Inventory">
+ <resultMap id="inventoryResultMap" type="org.springblade.modules.InventoryLoss.vo.InventoryVO">
<result column="id" property="id"/>
-
+ <result column="strain_name" property="strainName"/>
+ <result column="dict_value" property="reasonName"/>
</resultMap>
<select id="selectSalePage" resultMap="inventoryResultMap">
- select *
- from sys_inventory
- where is_deleted = 0
+ select inventory.*,
+ strain.strain_name,bdb.dict_value
+ from sys_inventory inventory
+ LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
+ LEFT JOIN blade_dict_biz bdb ON inventory.reason = bdb.dict_key
+ where
+ <if test="inventory.strainId !=null and inventory.strainId != '' ">
+ inventory.strain_id = #{inventory.strainId} AND
+ </if>
+ bdb.code = "lossReason" AND inventory.is_deleted = 0 ORDER BY inventory.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3