From 39716db4373ffb6e3638a5f0dfec274da8f942d2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 16:47:54 +0800
Subject: [PATCH] 大屏返回加工产品库存数量
---
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
index 17bafe9..fc8d666 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -13,6 +13,9 @@
import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.service.FarmProductStockService;
import org.springblade.modules.farmplant.vo.FarmProductStockVO;
+import org.springblade.modules.process.service.IProcessService;
+import org.springblade.modules.processInv.entity.ProcessInv;
+import org.springblade.modules.processInv.service.IProcessInvService;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -31,6 +34,8 @@
public class FarmProductStockController extends BladeController {
private final FarmProductStockService farmProductStockService;
+ private final IProcessInvService processInvService;
+ private final IProcessService processService;
/**
* 详情
@@ -197,7 +202,9 @@
//统计当前库存农产品
Map<String, String> sum = farmProductStockService.statisticsStock(year, farmId);
//统计当前库存加工产品
- Map<String, String> jgsum = null;
+// Map<String, String> jgsum = null;
+ Double jgsum = processInvService.statisticsStock(year,farmId);
+ Double jgNcl = processService.statistics(year,farmId);
if (sum != null){
map.put("sum",sum.get("sum"));
map.put("ncpNcl", sum.get("cssum"));
@@ -205,7 +212,7 @@
map.put("sum",0);
map.put("ncpNcl",0);
}
- map.put("jgsum",0);
+ map.put("jgsum",jgsum);
//农产品年产量统计
// List<Map<String, Double>> Nsum = farmProductStockService.statisticsYield(year, deptId);
@@ -214,7 +221,7 @@
//加工产品年产量统计
- map.put("jgNcl",0);
+ map.put("jgNcl",jgNcl);
return R.data(map);
}
--
Gitblit v1.9.3