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/soldr/mapper/SoldrMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
index 86a6a91..9262c12 100644
--- a/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
+++ b/src/main/java/org/springblade/modules/soldr/mapper/SoldrMapper.xml
@@ -29,7 +29,7 @@
</select>
<select id="selectLists" resultType="org.springblade.modules.soldr.vo.SoldrVO">
- SELECT st.stock_id1,
+ SELECT st.id,st.stock_id1,
st.specs1,
st.sid,
st.amount1 AS amount1,
@@ -50,7 +50,8 @@
WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''">
AND blade_dict_biz.tenant_id = #{soldr.codes}
</if>) c ON c.dict_key = st.specs_val2
- LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if test="soldr.codes!=null and soldr.codes != ''">
+ LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 <if
+ test="soldr.codes!=null and soldr.codes != ''">
AND blade_dict_biz.tenant_id = #{soldr.codes}
</if>) a ON
a.dict_key = stf.type
@@ -68,4 +69,56 @@
from sys_soldr
where sid = #{id}
</delete>
+
+ <delete id="dels">
+ delete
+ from sys_soldr
+ where id = #{id}
+ </delete>
+
+ <!--已出农资列表-->
+ <select id="selectSol" resultType="org.springblade.modules.soldr.vo.SoldrVO">
+ SELECT st.id,
+ st.stock_id1,
+ st.specs1,
+ st.sid,
+ st.amount1 AS amount1,
+ stf.factory_name AS factoryName,
+ a.dict_value AS stype,
+ d.dict_value AS dic1,
+ c.dict_value AS dic2,
+ stf.agricultural_name as agrname
+ FROM sys_soldr st
+ LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id1
+ LEFT JOIN (SELECT dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'stockSpecs1'
+ AND is_deleted = 0) d ON d.dict_key = st.specs_val1
+ 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_val2
+ 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
+ </select>
+
+ <!--查询是否存在已出库农资-->
+ <select id="selectCz" resultType="java.util.Map">
+ SELECT census, sid, amount1
+ FROM `sys_soldr`
+ WHERE sid = #{sid}
+ </select>
+<!-- 根据stockId、specs1、specs_val1、specs_val2、sid-->
+ <select id="getByServalParam" resultType="org.springblade.modules.soldr.entity.Soldr">
+ SELECT * FROM sys_soldr WHERE
+ stock_id1 = #{stockId1} and specs1=#{specs1} and specs_val1=#{specsVal1} and specs_val2=#{specsVal2} and sid=#{sid} and type=#{type} and is_deleted=0
+ </select>
+
+ <update id="cancelDel">
+ UPDATE sys_soldr SET is_deleted = 0 WHERE id = #{id}
+ </update>
+
</mapper>
--
Gitblit v1.9.3