From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index 4513540..e864db5 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -30,6 +30,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.soldr.entity.Soldr;
import org.springblade.modules.soldr.service.ISoldrService;
+import org.springblade.modules.soldr.vo.SoldrVO;
import org.springblade.modules.soldrecord.entity.Soldrecord;
import org.springblade.modules.soldrecord.service.ISoldrecordService;
import org.springblade.modules.stock.entity.Stock;
@@ -45,6 +46,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import java.util.List;
+import java.util.Map;
/**
* 出入库记录 控制器
@@ -146,11 +148,45 @@
Integer num = stockrecord.getNum();
//出库量
Integer amount1 = stockrecord.getAmount1();
+ //规格
+ String specs1 = stockrecord.getSpecs1();
+ int spe = Integer.parseInt(specs1);
//当前总量
int i = num - amount1;
Stock stock = new Stock();
stock.setId(stockrecord.getSid());
stock.setAmount(i);
+ //统计公斤
+ Integer specsValue1 = stockrecord.getSpecsVal1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = amount1* spe * 0.001;
+ }
+ //斤
+ if (specsValue1 == 1) {
+ v = amount1* spe * 0.5;
+ }
+ //公斤
+ if (specsValue1 == 2) {
+ v = amount1* spe;
+ }
+ //吨
+ if (specsValue1 == 3) {
+ v = amount1 * spe * 1000;
+ }
+ //毫升
+ if (specsValue1 == 4) {
+ //毫升换成升
+ double s = amount1* spe * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ if (specsValue1 == 5) {
+ v = amount1* spe;
+ }
+ stockrecord.setCensus(v);
if (i == 0) {
stock.setState("1");
stockService.UpdaeAmountc(stock);
@@ -169,23 +205,29 @@
soldrecord.setSpecsVal1(stockrecord.getSpecsVal1());
soldrecord.setSpecsVal2(stockrecord.getSpecsVal2());
soldrecord.setType(stockrecord.getType1());
+ soldrecord.setSid(stockrecord.getSid());
String type1 = stockrecord.getType1();
if (type1.equals("0")) {
//已出库农资数量记录
Soldr soldr = new Soldr();
soldr.setSid(stockrecord.getSid());
soldr.setStockId1(stockrecord.getStockId1());
- soldr.setStockId1(stockrecord.getStockId1());
soldr.setAmount1(amount1);
soldr.setSpecs1(stockrecord.getSpecs1());
soldr.setSpecsVal1(stockrecord.getSpecsVal1());
soldr.setSpecsVal2(stockrecord.getSpecsVal2());
soldr.setType(stockrecord.getType1());
+ soldr.setCensus(v);
//已出库农资数量
- Soldr detail = soldrService.getOne(Condition.getQueryWrapper(soldr));
- if (null != detail) {
- Integer amount11 = detail.getAmount1();
- soldrecordService.updateSold(amount11 + amount1, detail.getSid());
+ List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
+ if (maps.size()!=0) {
+ String a = maps.get(0).get("amount1").toString();
+ Integer amount11=Integer.parseInt(a);
+ String amount12 = maps.get(0).get("amount1").toString();
+ Double census = Double.parseDouble(amount12);
+ String sid = maps.get(0).get("sid").toString();
+ Long si=Long.valueOf(sid);
+ soldrecordService.updateSold(amount11 + amount1, si,census+v);
} else {
soldrService.save(soldr);
}
@@ -199,6 +241,8 @@
Integer num = stockrecord.getNum();
//入库量
Integer amount1 = stockrecord.getAmount1();
+ String specs1 = stockrecord.getSpecs1();
+ int spe=Integer.parseInt(specs1);
//当前总量
int i = num + amount1;
Stock stock = new Stock();
@@ -206,6 +250,37 @@
stock.setAmount(i);
stock.setState("0");
stockService.UpdaeAmountc(stock);
+ //统计公斤
+ Integer specsValue1 = stockrecord.getSpecsVal1();
+ double v = 0;
+ //克
+ if (specsValue1 == 0) {
+ v = amount1*spe * 0.001;
+ }
+ //斤
+ if (specsValue1 == 1) {
+ v = amount1*spe * 0.5;
+ }
+ //公斤
+ if (specsValue1 == 2) {
+ v = amount1*spe;
+ }
+ //吨
+ if (specsValue1 == 3) {
+ v = amount1*spe * 1000;
+ }
+ //毫升
+ if (specsValue1 == 4) {
+ //毫升换成升
+ double s = amount1*spe * 0.001;
+ //升换成公斤
+ v = s;
+ }
+ //升
+ if (specsValue1 == 5) {
+ v = amount1*spe;
+ }
+ stockrecord.setCensus(v);
}
return R.status(stockrecordService.save(stockrecord));
}
--
Gitblit v1.9.3