From 1976d790db5d2230e0e74662701b71b6740b3b20 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 14 Jun 2022 12:00:11 +0800
Subject: [PATCH] 农资库存管理

---
 src/main/java/org/springblade/modules/stock/controller/StockController.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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 f4518a5..4e6034d 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.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -232,9 +233,9 @@
 	 *
 	 * @return
 	 */
-	@PostMapping("/StockCount")
-	public R StockCount() {
-		List<Map<String, Object>> maps = stockService.StockCount();
+	@GetMapping("/StockCount")
+	public R StockCount(String detpId) {
+		List<Map<String, Object>> maps = stockService.StockCount(detpId);
 		//化肥0
 		double hf = 0;
 		//有机肥1
@@ -455,11 +456,14 @@
 			cknu += cknum;
 		}
 		Map map= new HashMap();
-		map.put("rknum",rknu);
-		map.put("cknum",cknu);
-		List list = new ArrayList();
-		list.add(map);
-		return R.data(list);
+		DecimalFormat df = new DecimalFormat("#0.000");
+		String format = df.format(rknu);
+		Double a = Double.parseDouble(format);
+		String format1 = df.format(cknu);
+		double b = Double.parseDouble(format1);
+		map.put("rknum",a);
+		map.put("cknum",b);
+		return R.data(map);
 	}
 
 

--
Gitblit v1.9.3