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/farmplant/controller/FarmProductStockController.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 19359ee..17bafe9 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -65,6 +65,15 @@
 		return R.data(pages);
 	}
 
+
+	@GetMapping("/strainCount")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入farmProductStock")
+	public R<IPage<FarmProductStockVO>> strainCount(FarmProductStockVO farmProductStock, Query query) {
+		IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPagesCount(Condition.getPage(query), farmProductStock);
+		return R.data(pages);
+	}
+
 	/**
 	 * 自定义分页
 	 */
@@ -236,4 +245,10 @@
 		return R.data(cssum);
 	}
 
+	@GetMapping("/getByLandId")
+	public R getByLandId(String strainId,String landId){
+		FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(strainId,landId);
+		return R.data(farmProductStock);
+	}
+
 }

--
Gitblit v1.9.3