From 0f51855b9046632aef8b517eb35b9116e5ea8b72 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 May 2022 14:50:27 +0800
Subject: [PATCH] 农资管理
---
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index 09909f5..d77ff70 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -34,9 +34,10 @@
<select id="selectLists" resultType="org.springblade.modules.stock.vo.StockVO">
SELECT st.*,
stf.factory_name AS factoryName,
- stf.type AS stype,
+ a.dict_value AS stype,
d.dict_value AS dic1,
- c.dict_value AS dic2
+ c.dict_value AS dic2,
+ stf.agricultural_name as agrname
FROM sys_stock st
LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id
LEFT JOIN (SELECT dict_key, dict_value
@@ -45,7 +46,9 @@
LEFT JOIN (SELECT dict_key, dict_value
FROM blade_dict_biz
WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_value2
- WHERE st.is_deleted = 0
+ LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON
+ a.dict_key = stf.type
+ WHERE st.is_deleted = 0 and state=0
<if test="stock.stype!=null and stock.stype != ''">
and stf.type = #{stock.stype}
</if>
@@ -61,10 +64,18 @@
<if test="stock.type!=null and stock.type != ''">
and st.type = #{stock.type}
</if>
+ <if test="stock.agrname!=null and stock.agrname != ''">
+ and stf.agricultural_name like concat('%', #{stock.agrname},'%')
+ </if>
</select>
<!--入库出库-->
<update id="UpdaeAmountc">
- update sys_stock set amount = #{stock.amount} ,state=#{stock.state} where stock_id=#{stock.stockId}
+ update sys_stock set amount = #{stock.amount} ,state=#{stock.state} where id=#{stock.id}
+ </update>
+
+ <!--入库出库-->
+ <update id="Updaet">
+ update sys_stock set amount = #{stock.amount} where id=#{stock.id}
</update>
</mapper>
--
Gitblit v1.9.3