From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java | 14 +++++++++++++-
1 files changed, 13 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 4d20f68..6938bcc 100644
--- a/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
+++ b/src/main/java/org/springblade/modules/recovery/controller/RecoveryController.java
@@ -102,6 +102,9 @@
//采收
record.setType("12");
record.setLandId(recovery.getLandId());
+ record.setDeptId(recovery.getDeptId());
+ record.setTenantId(recovery.getTenantId());
+ record.setStrainId(recovery.getStrainId());
record.setOperator(recovery.getOperator());
Strain strain = strainService.getById(recovery.getStrainId());
record.setContent("品种: " + strain.getStrainName() + ", 重量：" + recovery.getWeight());
@@ -111,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) {
@@ -121,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 {
@@ -132,7 +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