From 5c0d7d949d2ec0fdbd7ce411416be7aea4e58c53 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:47:14 +0800
Subject: [PATCH] 采收保存修改,判断地块,按地块存库存

---
 src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java |    5 +++--
 1 files changed, 3 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 9c2a4b8..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) {
 				//更新库存
@@ -144,6 +144,7 @@
 				productStock.setFarmPlantId(recovery.getFarmPlantId());
 				productStock.setTenantId(recovery.getTenantId());
 				productStock.setDeptId(recovery.getDeptId());
+				productStock.setLandId(recovery.getLandId());
 				//新增操作
 				farmProductStockService.save(productStock);
 			}

--
Gitblit v1.9.3