From e71881a6ade967e45ba62b802028e2a2d2dfdee0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Jun 2022 18:05:07 +0800
Subject: [PATCH] 农资库存管理
---
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 933d5ff..41b1581 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -42,11 +42,19 @@
LEFT JOIN sys_stockfactory stf ON stf.id = st.stock_id
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_value1
+ WHERE CODE = 'stockSpecs1' AND is_deleted = 0
+ <if test="stock.codes!=null and stock.codes != ''">
+ AND blade_dict_biz.tenant_id = #{stock.codes}
+ </if>) 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_value2
- LEFT JOIN ( SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockType' AND is_deleted = 0 ) a ON
+ WHERE CODE = 'stockSpecs2' AND is_deleted = 0 <if test="stock.codes!=null and stock.codes != ''">
+ AND blade_dict_biz.tenant_id = #{stock.codes}
+ </if>) 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
+ <if test="stock.codes!=null and stock.codes != ''">
+ AND blade_dict_biz.tenant_id = #{stock.codes}
+ </if>) a ON
a.dict_key = stf.type
WHERE st.is_deleted = 0 and state=0
<if test="stock.stype!=null and stock.stype != ''">
@@ -167,7 +175,7 @@
sto.type
FROM `sys_stock` st
LEFT JOIN (SELECT id, type FROM sys_stockfactory) sto ON st.stock_id = sto.id
- WHERE st.is_deleted = 0
+ WHERE st.is_deleted = 0 and dept_id=#{deptId}
</select>
<!--小程序数据统计-->
@@ -196,10 +204,10 @@
WHERE stock_type1 = 1
AND type1 = 0
<if test="startTime!=null and startTime!=''">
- and time1 >= #{stock.startTime}
+ and time1 >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
- and time1 <= #{stock.endTime}
+ and time1 <= #{endTime}
</if>
GROUP BY stock_id1) cg ON cg.stock_id1 = a.id
LEFT JOIN (SELECT stock_id1, SUM(census) AS dbrknum
@@ -207,10 +215,10 @@
WHERE stock_type1 = 1
AND type1 = 1
<if test="startTime!=null and startTime!=''">
- and time1 >= #{stock.startTime}
+ and time1 >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
- and time1 <= #{stock.endTime}
+ and time1 <= #{endTime}
</if>
GROUP BY stock_id1) dbr ON dbr.stock_id1 = a.id
LEFT JOIN (SELECT stock_id1, SUM(census) AS lycknum
@@ -218,10 +226,10 @@
WHERE stock_type1 = 0
AND type1 = 0
<if test="startTime!=null and startTime!=''">
- and time1 >= #{stock.startTime}
+ and time1 >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
- and time1 <= #{stock.endTime}
+ and time1 <= #{endTime}
</if>
GROUP BY stock_id1) lyc ON lyc.stock_id1 = a.id
LEFT JOIN (SELECT stock_id1, SUM(census) AS dbcknum
@@ -229,10 +237,10 @@
WHERE stock_type1 = 0
AND type1 = 1
<if test="startTime!=null and startTime!=''">
- and time1 >= #{stock.startTime}
+ and time1 >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
- and time1 <= #{stock.endTime}
+ and time1 <= #{endTime}
</if>
GROUP BY stock_id1) dbc ON dbc.stock_id1 = a.id
LEFT JOIN (SELECT stock_id1, SUM(census) AS bfcknum
@@ -240,10 +248,10 @@
WHERE stock_type1 = 0
AND type1 = 2
<if test="startTime!=null and startTime!=''">
- and time1 >= #{stock.startTime}
+ and time1 >= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
- and time1 <= #{stock.endTime}
+ and time1 <= #{endTime}
</if>
GROUP BY stock_id1) bfc ON bfc.stock_id1 = a.id
</select>
--
Gitblit v1.9.3