From 0c90b05a7df664f8dcab2c4b330c07c7b80745a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 30 May 2022 16:05:53 +0800
Subject: [PATCH] 种养结束修改
---
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 ff4c038..d77ff70 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -33,10 +33,11 @@
<select id="selectLists" resultType="org.springblade.modules.stock.vo.StockVO">
SELECT st.*,
- stf.agricultural_name AS factoryName,
- stf.type AS stype,
+ stf.factory_name AS factoryName,
+ 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
@@ -44,8 +45,10 @@
WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = st.specs_value1
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_value1
- WHERE st.is_deleted = 0
+ WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = st.specs_value2
+ 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,6 +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 id=#{stock.id}
+ </update>
+
+ <!--入库出库-->
+ <update id="Updaet">
+ update sys_stock set amount = #{stock.amount} where id=#{stock.id}
+ </update>
</mapper>
--
Gitblit v1.9.3