From 2af6fc082247372eb11fb54320345c0fcfa26518 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 20 Jul 2022 12:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java | 6 +++---
src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java | 5 ++++-
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml | 1 +
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 4 ++--
src/main/java/org/springblade/modules/stock/controller/StockController.java | 13 +++++++------
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
index 558f81d..57ca548 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/controller/InventoryController.java
@@ -110,13 +110,13 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入sale")
- public R submit(@Valid @RequestBody Inventory inventory) {
- boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getStrainId());
+ public R submit(@Valid @RequestBody InventoryVO inventory) {
+ boolean res = farmProductStockService.stockCompare(inventory.getSaleNum(),inventory.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getStrainId());
+ farmProductStockService.stockReduce(inventory.getSaleNum(),inventory.getProid());
}
return R.status(inventoryService.saveOrUpdate(inventory));
}
diff --git a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
index e1482f1..ffe1957 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
+++ b/src/main/java/org/springblade/modules/InventoryLoss/vo/InventoryVO.java
@@ -30,5 +30,8 @@
@EqualsAndHashCode(callSuper = true)
public class InventoryVO extends Inventory {
private static final long serialVersionUID = 1L;
-
+ /**
+ * 库存量主键id
+ */
+ private String proid;
}
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index 522d9f9..5e296bf 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -113,12 +113,12 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入sale")
public R submit(@Valid @RequestBody SaleVO sale) {
- boolean res = farmProductStockService.stockCompare(sale.getSaleNum(),sale.getStrainId());
+ boolean res = farmProductStockService.stockCompare(sale.getSaleNum(),sale.getProid());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
}else {
//库存充足，减去相应库存
- farmProductStockService.stockReduce(sale.getSaleNum(),sale.getStrainId());
+ farmProductStockService.stockReduce(sale.getSaleNum(),sale.getProid());
}
return R.status(saleService.saveOrUpdate(sale));
}
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 d1b9329..8b81c03 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -41,6 +41,7 @@
import org.springblade.modules.stock.service.IStockService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
@@ -256,7 +257,7 @@
*/
@GetMapping("/StockCount")
public R StockCount(String detpId) {
- List<Map<String, Object>> maps = stockService.StockCount("1123598813738675201");
+ List<Map<String, Object>> maps = stockService.StockCount(detpId);
//化肥0
double hf = 0;
//有机肥1
@@ -426,19 +427,19 @@
}
Map map = new HashMap();
map.put("name", "化肥");
- map.put("val", hf);
+ map.put("val", new BigDecimal(hf).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map1 = new HashMap();
map1.put("name", "有机肥");
- map1.put("val", yjf);
+ map1.put("val", new BigDecimal(String.valueOf(yjf)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map2 = new HashMap();
map2.put("name", "杀虫剂");
- map2.put("val", scj);
+ map2.put("val", new BigDecimal(String.valueOf(scj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map3 = new HashMap();
map3.put("name", "杀菌剂");
- map3.put("val", sjj);
+ map2.put("val", new BigDecimal(String.valueOf(sjj)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
Map map4 = new HashMap();
map4.put("name", "饲料");
- map4.put("val", sl);
+ map2.put("val", new BigDecimal(String.valueOf(sl)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
List list = new ArrayList();
list.add(map);
list.add(map1);
diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index 88101ca..7067928 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -89,6 +89,7 @@
<if test="stockrecord.sid!=null and stockrecord.sid != ''">
and st.sid = #{stockrecord.sid}
</if>
+ ORDER BY st.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3