From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 a8b1040..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);
+ }
+
/**
* 自定义分页
*/
@@ -74,6 +83,15 @@
public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) {
List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock);
return R.data(pages);
+ }
+
+ @GetMapping("/getFarmProductStockByFarmIdAndStrainId")
+ public R<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId,Integer strainId) {
+ List<FarmProductStock> farmProductStockList = farmProductStockService.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
+ if (farmProductStockList.size() == 0) {
+ return R.data(null);
+ }
+ return R.data(farmProductStockList.get(0));
}
/**
@@ -227,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