From 8e65eb751d8e3c18d9d2134df084d349e55f1985 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:42:28 +0800
Subject: [PATCH] 首页执行农事操作要使用农资时，农资库存表会进行相应的变化
---
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 11 +++++++++--
1 files changed, 9 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 ecfa279..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) {
//更新库存
@@ -124,6 +124,11 @@
double now = Double.parseDouble(recovery.getWeight());
double addNum = add(old, now);
stock1.setWeight(String.valueOf(addNum));
+
+ //总采收
+ double olds = Double.parseDouble(stock1.getRecovery());
+ double addNums = add(olds, now);
+ stock1.setRecovery(String.valueOf(addNums));
//更新
farmProductStockService.updateById(stock1);
} else {
@@ -135,9 +140,11 @@
productStock.setTime(recovery.getTime());
productStock.setStrainId(recovery.getStrainId());
productStock.setWeight(recovery.getWeight());
+ productStock.setRecovery(recovery.getWeight());
productStock.setFarmPlantId(recovery.getFarmPlantId());
productStock.setTenantId(recovery.getTenantId());
productStock.setDeptId(recovery.getDeptId());
+ productStock.setLandId(recovery.getLandId());
//新增操作
farmProductStockService.save(productStock);
}
--
Gitblit v1.9.3