From 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jul 2022 15:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
index 6938bcc..5163eec 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -112,10 +112,10 @@
 			farmingRecordService.save(record);
 
 			//库存
-			//先查询是否有该农产品的库存
+			//先查询是否有该农产品的库存(根据地块,农产品)
 			FarmProductStock stock = new FarmProductStock();
-//			stock.setFarmPlantId(recovery.getFarmPlantId());
 			stock.setStrainId(recovery.getStrainId());
+			stock.setLandId(recovery.getLandId());
 			FarmProductStock stock1 = farmProductStockService.getOne(new QueryWrapper<>(stock));
 			if (null != stock1) {
 				//更新库存

--
Gitblit v1.9.3