From b7b04173afd9a05cedda9f44c53e52847806fb51 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 04 Aug 2022 15:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
index 71199ac..c17701d 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -25,6 +25,14 @@
* @return
*/
List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
+
+ /**
+ * 农资库存整合
+ * @param page
+ * @param farmProductStock
+ * @return
+ */
+ IPage<FarmProductStockVO> selectFarmProductStockPageCount(IPage<Object> page, FarmProductStockVO farmProductStock);
List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock);
List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(@Param("farmId") String farmId, @Param("strainId") Integer strainId);
--
Gitblit v1.9.3