From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录,修复当农资库存为1时出库再退回,农资库存数据有误

---
 src/main/java/org/springblade/modules/lang/controller/LandController.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index fca780a..2261a08 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -108,11 +108,20 @@
 		return R.data(pages);
 	}
 	/**
-	 * 根据品种id查询对应地块
+	 * 根据品种id查询对应地块(农产品库存)
 	 */
 	@GetMapping("/selcetByStrainId")
-	public R selcetByStrainId(String strainId) {
-		List<Land> list = landService.selectByStrainId(strainId);
+	public R selcetByStrainId(String strainId,String farmId) {
+		List<Land> list = landService.selectByStrainId(strainId,farmId);
+		return R.data(list);
+	}
+
+	/**
+	 * 根据品种id查询对应地块(种养品种)
+	 */
+	@GetMapping("/getByStrainIdFarmId")
+	public R getByStrainIdFarmId(LandVO land) {
+		List<Land> list = landService.getByStrainIdFarmId(land);
 		return R.data(list);
 	}
 

--
Gitblit v1.9.3