地块统计接口修改

Administrator

2022-07-14 85de465560468fe08f6d846e2d6beacb20b71da3

 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);
         }