From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
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..bb6ed60 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(String strainId,String farmId) {
+ List<Land> list = landService.getByStrainIdFarmId(strainId,farmId);
return R.data(list);
}
--
Gitblit v1.9.3