From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
index acb8f47..5ddfbe7 100644
--- a/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
+++ b/src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -20,7 +20,36 @@
<select id="selectStockfactoryPage" resultMap="stockfactoryResultMap">
- select * from sys_stockfactory where is_deleted = 0
+ select *
+ from sys_stockfactory
+ where is_deleted = 0
+ </select>
+ <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap">
+ select *
+ from sys_stockfactory
+ where is_deleted = 0
+ </select>
+
+ <select id="selectStockFa" resultType="java.util.HashMap">
+ select id as dictKey, agricultural_name as dictValue
+ from sys_stockfactory
+ where is_deleted = 0
+ </select>
+
+ <!--小程序农资列表-->
+ <select id="selectStockIn" resultType="java.util.HashMap">
+ SELECT DISTINCT s.id AS id,
+ s.agricultural_name AS agrname,
+ s.factory_name AS factoryname,
+ c.dict_value AS dic
+ FROM sys_stockfactory s
+ LEFT JOIN (SELECT dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'stockType' AND is_deleted = 0) c ON c.dict_key = s.type
+ WHERE is_deleted = 0
+ <if test="name!=null and name!=''">
+ and (s.agricultural_name like concat('%',#{name},'%') or s.register_number like concat('%',#{name},'%') )
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3