From 8e65eb751d8e3c18d9d2134df084d349e55f1985 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:42:28 +0800
Subject: [PATCH] 首页执行农事操作要使用农资时，农资库存表会进行相应的变化
---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
index c57d149..6b17768 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -147,6 +147,13 @@
}
+ /**
+ * 退回
+ * @param num 数量
+ * @param id 农资id
+ * @param type
+ * @return
+ */
@PostMapping("/out")
public R out(Integer num, Long id, Integer type) {
//如果等于就修改并删除
@@ -164,6 +171,7 @@
else {
Soldr soldr = new Soldr();
soldr.setSid(id);
+ //通过农资库存id找到已出库农资表中对应的农资
Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
Integer amount1 = detail.getAmount1();
Double census = detail.getCensus();
@@ -175,34 +183,37 @@
v = num * 0.001;
}
//斤
- if (specsValue1 == 1) {
+ else if (specsValue1 == 1) {
v = num * 0.5;
}
//公斤
- if (specsValue1 == 2) {
+ else if (specsValue1 == 2) {
v = num;
}
//吨
- if (specsValue1 == 3) {
+ else if (specsValue1 == 3) {
v = num * 1000;
}
//毫升
- if (specsValue1 == 4) {
+ else if (specsValue1 == 4) {
//毫升换成升
double s = num * 0.001;
//升换成公斤
v = s;
}
//升
- if (specsValue1 == 5) {
+ else{
v = num;
}
+ //更新已出库农资的数据
soldrecordService.updateSold(amount1 - num, id,census-v);
Stock stock = new Stock();
stock.setId(id);
+ //根据传过来的sid获取对应的库存表数据
Stock detail1 = stockService.getOne(Condition.getQueryWrapper(stock));
Integer amount = detail1.getAmount();
stock.setAmount(amount + num);
+ //更新库存表
stockService.Updaet(stock);
}
return R.success("退回成功");
@@ -276,8 +287,8 @@
* @return
*/
@GetMapping("/selectSol")
- public R selectSol() {
- List<SoldrVO> soldrVOS = soldrService.selectSol();
+ public R selectSol(String farmId) {
+ List<SoldrVO> soldrVOS = soldrService.selectSol(farmId);
for (int i = 0; i < soldrVOS.size(); i++) {
String specs1 = soldrVOS.get(i).getSpecs1();
String dic1 = soldrVOS.get(i).getDic1();
--
Gitblit v1.9.3