From 4f6f313d842301106ac9dc79bf39d5ba5f571899 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 26 Jul 2022 15:17:58 +0800
Subject: [PATCH] 新增查询条件strainType和strainType
---
src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java | 5 +++++
src/main/java/org/springblade/modules/stock/vo/StocksVO.java | 5 ++++-
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 3 +++
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 5 ++++-
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 7742614..3f35479 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -357,6 +357,9 @@
<if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''">
and sfps.tenant_id = #{farmProductStock.tenantId}
</if>
+ <if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
+ and ss.strain_type = #{farmProductStock.strainType}
+ </if>
</select>
<!--销售对比库存是否充足-->
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
index 55e3959..7dd915d 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java
@@ -38,4 +38,9 @@
*/
private String farmId;
+ /**
+ * 品种类型(0种植 1水产 2畜牧)
+ */
+ private String strainType;
+
}
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 0e83182..51dfe84 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -152,8 +152,11 @@
stf.agricultural_name,
stf.factory_name
FROM sys_stockrecord st
- LEFT JOIN (SELECT id, agricultural_name, factory_name FROM sys_stockfactory) stf
+ LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
ON st.stock_id1 = stf.id
+ <if test="stock.stockType !=null and stock.stockType != '' ">
+ WHERE stf.type =#{stock.stockType}
+ </if>
GROUP BY stf.id,
stf.agricultural_name,
stf.factory_name
diff --git a/src/main/java/org/springblade/modules/stock/vo/StocksVO.java b/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
index 2b3a5dc..10bc130 100644
--- a/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
+++ b/src/main/java/org/springblade/modules/stock/vo/StocksVO.java
@@ -56,5 +56,8 @@
* 总的出库数量
*/
Double zcknum;
-
+ /**
+ * 农资类型分类（0：化肥 1：有机肥 2：杀虫剂 等）
+ */
+ String stockType;
}
--
Gitblit v1.9.3