From 3efd7f01cba4aaa09f75662e287bfa4c780990cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 12 Jul 2022 16:22:05 +0800
Subject: [PATCH] 地块id添加

---
 src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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..6938bcc 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -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