From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录,修复当农资库存为1时出库再退回,农资库存数据有误
---
src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
index 3412ccd..a216c2f 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmingRecordController.java
@@ -71,6 +71,16 @@
}
/**
+ * 获取农事记录详情带中文
+ * @param farmingRecordVO
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(FarmingRecordVO farmingRecordVO){
+ return R.data(farmService.getDetails(farmingRecordVO));
+ }
+
+ /**
* 分页
*/
@GetMapping("/list")
@@ -174,6 +184,8 @@
soldrService.dels(id);
} else {
soldrecordService.updateSold(amount1 - farm.getSnum(), id, detail.getCensus() - v);
+ detail.setAmount1(detail.getAmount1()-farm.getSnum());
+ soldrService.updateById(detail);
}
}
return R.status(farmService.save(farm));
--
Gitblit v1.9.3