From e0613d9a7d3047fadd97ce9ee9012b68ee829801 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Jul 2022 15:57:50 +0800
Subject: [PATCH] 溯源扫描基础接口新增，统计查询接口新增，用户农场绑定，地块农场绑定
---
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 6c2d515..9c2a4b8 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -114,7 +114,7 @@
//库存
//先查询是否有该农产品的库存
FarmProductStock stock = new FarmProductStock();
- stock.setFarmPlantId(recovery.getFarmPlantId());
+// stock.setFarmPlantId(recovery.getFarmPlantId());
stock.setStrainId(recovery.getStrainId());
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,6 +140,7 @@
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());
--
Gitblit v1.9.3