From fa326e87de2805d8b66b301daee596b1d959e430 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 11:42:45 +0800
Subject: [PATCH] 出入库记录删除回滚逻辑修改
---
src/main/java/org/springblade/modules/stock/controller/StockController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index 8b81c03..85c9ab5 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -154,6 +154,7 @@
stockrecord.setSpecs1(stock.getSpecs());
stockrecord.setSpecsVal1(stock.getSpecsValue1());
stockrecord.setSpecsVal2(stock.getSpecsValue2());
+ stockrecord.setDeptId(stock.getDeptId());
stockrecord.setSp1("stockSpecs1");
stockrecord.setSp2("stockSpecs2");
//统计公斤
@@ -256,8 +257,8 @@
* @return
*/
@GetMapping("/StockCount")
- public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount(detpId);
+ public R StockCount(String deptId) {
+ List<Map<String, Object>> maps = stockService.StockCount(deptId);
//化肥0
double hf = 0;
//有机肥1
@@ -436,10 +437,10 @@
map2.put("val", new BigDecimal(String.valueOf(scj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map3 = new HashMap();
map3.put("name", "杀菌剂");
- map2.put("val", new BigDecimal(String.valueOf(sjj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+ map3.put("val", new BigDecimal(String.valueOf(sjj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map4 = new HashMap();
map4.put("name", "饲料");
- map2.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+ map4.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
List list = new ArrayList();
list.add(map);
list.add(map1);
--
Gitblit v1.9.3