From 5aa07d22c04bdfc3f5d6b9648bb7132b25bac849 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Jun 2022 15:37:03 +0800
Subject: [PATCH] 农资库存管理

---
 src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml b/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
index 8874abc..07059c2 100644
--- a/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/soldrecord/mapper/SoldrecordMapper.xml
@@ -67,25 +67,34 @@
     <!--查看变更明细-->
     <select id="selectListbg" resultType="org.springblade.modules.soldrecord.vo.SoldrecordVO">
         SELECT st.stock_id1,
-               st.specs1,
-               st.amount1,
-               stf.factory_name      AS factoryName,
-               stf.type as stype,
-               d.dict_value          AS dic1,
-               c.dict_value          AS dic2,
-               b.dict_value          AS dic3,
-               stf.agricultural_name AS agrname
+        st.specs1,
+        st.amount1,
+        st.create_time,
+        f.real_name as username,
+        stf.factory_name AS factoryName,
+        stf.type as stype,
+        d.dict_value AS dic1,
+        c.dict_value AS dic2,
+        b.dict_value AS dic3,
+        stf.agricultural_name AS agrname
         FROM sys_soldrecord 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 = 'stockPurchase1' AND is_deleted = 0) b ON b.dict_key = st.type
+        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 <if test="soldrecord.codes!=null and soldrecord.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldrecord.codes}
+    </if>) 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 <if test="soldrecord.codes!=null and soldrecord.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldrecord.codes}
+    </if>) c ON c.dict_key = st.specs_val2
+        LEFT JOIN (SELECT dict_key, dict_value
+        FROM blade_dict_biz
+        WHERE CODE = 'stockPurchase1' AND is_deleted = 0 <if test="soldrecord.codes!=null and soldrecord.codes != ''">
+        AND blade_dict_biz.tenant_id = #{soldrecord.codes}
+    </if>) b ON b.dict_key = st.type
+        LEFT JOIN ( SELECT id, real_name FROM blade_user ) f ON f.id=st.create_user
         WHERE st.is_deleted = 0
         <if test="soldrecord.stockId1!=null and soldrecord.stockId1 != ''">
             and st.stock_id1 = #{soldrecord.stockId1}
@@ -93,11 +102,15 @@
     </select>
 
     <update id="updateSold">
-        update sys_soldr set amount1=#{amount} where sid = #{id}
+        update sys_soldr
+        set amount1=#{amount}
+        where sid = #{id}
     </update>
 
     <delete id="delc">
-        delete from sys_soldrecord where stock_id1 = #{id}
+        delete
+        from sys_soldrecord
+        where stock_id1 = #{id}
     </delete>
 
 </mapper>

--
Gitblit v1.9.3