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/processInv/service/impl/ProcessInvServiceImpl.java | 6 +++
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java | 3 +
src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java | 4 ++
src/main/java/org/springblade/modules/process/mapper/ProcessMapper.java | 2 +
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 13 +++++-
src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml | 13 ++++++
src/main/java/org/springblade/modules/process/service/impl/ProcessServiceImpl.java | 5 ++
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 14 +++++++
src/main/java/org/springblade/modules/process/service/IProcessService.java | 2 +
9 files changed, 59 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);
}
diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.java b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.java
index 95886fd..c8bfdbc 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.java
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.java
@@ -43,4 +43,6 @@
boolean stockCompare(@Param("saleNum") Double saleNum, @Param("proid") String proid);
Boolean stockReduce(@Param("saleNum") Double saleNum, @Param("proid") String proid);
+
+ Double statistics(@Param("year") String year, @Param("farmId") String farmId);
}
diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
index d6c8197..bc60994 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -60,4 +60,17 @@
WHERE
id = #{proid}
</update>
+
+ <select id="statistics" resultType="java.lang.Double">
+ SELECT SUM(p.process_num) AS sum
+ FROM sys_process p
+ LEFT JOIN sys_land land ON land.id = p.land_id
+ WHERE 1=1 AND p.is_deleted = 0
+ <if test="year!=null and year!=''">
+ and YEAR ( p.sale_time ) = #{year}
+ </if>
+ <if test="farmId!=null and farmId!=''">
+ and land.farm_id = #{farmId}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/process/service/IProcessService.java b/src/main/java/org/springblade/modules/process/service/IProcessService.java
index 6d8ccfa..6bf94c9 100644
--- a/src/main/java/org/springblade/modules/process/service/IProcessService.java
+++ b/src/main/java/org/springblade/modules/process/service/IProcessService.java
@@ -53,4 +53,6 @@
* @return
*/
Boolean stockReduce(Double saleNum, String proid);
+
+ Double statistics(String year, String farmId);
}
diff --git a/src/main/java/org/springblade/modules/process/service/impl/ProcessServiceImpl.java b/src/main/java/org/springblade/modules/process/service/impl/ProcessServiceImpl.java
index f08246c..8b3527d 100644
--- a/src/main/java/org/springblade/modules/process/service/impl/ProcessServiceImpl.java
+++ b/src/main/java/org/springblade/modules/process/service/impl/ProcessServiceImpl.java
@@ -48,4 +48,9 @@
return baseMapper.stockReduce(saleNum,proid);
}
+ @Override
+ public Double statistics(String year, String farmId) {
+ return baseMapper.statistics(year,farmId);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
index a172811..c19f03b 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 加工库存表 Mapper 接口
@@ -55,4 +56,6 @@
ProcessInvVO getLand(@Param("processInv") ProcessInv processInv);
ProcessInv findById(@Param("prodId") String prodId);
+
+ Double statisticsStock(@Param("year") String year, @Param("farmId") String farmId);
}
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
index 913f73b..1c254b3 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -89,4 +89,18 @@
FROM sys_process_inv
WHERE is_deleted = 0 AND id = #{prodId}
</select>
+ <select id="statisticsStock" resultType="java.lang.Double">
+ SELECT SUM(inv.product_inventory_num) as sum
+ FROM sys_process_inv inv
+ LEFT JOIN sys_farm_product_stock sfps ON sfps.id = inv.fps_id
+ LEFT JOIN sys_land land ON land.id = sfps.land_id
+ WHERE 1=1 AND inv.is_deleted = 0
+ <if test="year!=null and year!=''">
+ and YEAR ( inv.create_time ) = #{year}
+ </if>
+ <if test="farmId!=null and farmId!=''">
+ and land.farm_id = #{farmId}
+ </if>
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java b/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
index b5210bf..9641635 100644
--- a/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
+++ b/src/main/java/org/springblade/modules/processInv/service/IProcessInvService.java
@@ -21,6 +21,8 @@
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.Map;
+
/**
* 加工库存表 服务类
*
@@ -62,4 +64,6 @@
ProcessInvVO getLand(ProcessInv processInv);
ProcessInv findById(String prodId);
+
+ Double statisticsStock(String year, String farmId);
}
diff --git a/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java b/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
index 26aff7e..c0d86ad 100644
--- a/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
+++ b/src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.Date;
+import java.util.Map;
/**
* 加工库存表 服务实现类
@@ -86,4 +87,9 @@
public ProcessInv findById(String prodId) {
return baseMapper.findById(prodId);
}
+
+ @Override
+ public Double statisticsStock(String year, String farmId) {
+ return baseMapper.statisticsStock(year,farmId);
+ }
}
--
Gitblit v1.9.3