From da571bdb2b7a267dedb8281136480d60ae47fa57 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Wed, 27 Jul 2022 10:28:52 +0800
Subject: [PATCH] 实现小程序出库功能
---
src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java | 3 +++
src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java | 6 ++++++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java | 2 ++
src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java | 9 +++++++++
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 7 +++++++
5 files changed, 27 insertions(+), 0 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 a8b1040..19359ee 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -76,6 +76,15 @@
return R.data(pages);
}
+ @GetMapping("/getFarmProductStockByFarmIdAndStrainId")
+ public R<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId,Integer strainId) {
+ List<FarmProductStock> farmProductStockList = farmProductStockService.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
+ if (farmProductStockList.size() == 0) {
+ return R.data(null);
+ }
+ return R.data(farmProductStockList.get(0));
+ }
+
/**
* 统计产量
*
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
index 223b367..2df6b9a 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -27,6 +27,8 @@
List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock);
List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock);
+ List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(@Param("farmId") String farmId, @Param("strainId") Integer strainId);
+
/**
* 统计产量
* @param farmProductStock
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 3f35479..47e9e81 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -63,6 +63,13 @@
group by sfps.strain_id,ss.url,ss.strain_name,sfps.land_id
</select>
+ <!--根据农场id和品种类型查询 关系：农产品库存表关联地块 -》 地块关联农场 -》 需要联合查询 -->
+ <select id="findFarmProductStockByFarmIdAndStrainId" resultType="org.springblade.modules.farmplant.entity.FarmProductStock">
+ select a.* from sys_farm_product_stock a
+ left join sys_land b on a.land_id = b.id
+ where 1=1 and a.strain_id = #{strainId} and b.farm_id = #{farmId}
+ </select>
+
<!--查询农产品库存数据-->
<select id="statisticsProduct" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
index b8848ba..6bea074 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.farmplant.entity.FarmProductStock;
+import org.springblade.modules.farmplant.service.impl.FarmProductStockServiceImpl;
import org.springblade.modules.farmplant.vo.FarmProductStockVO;
import java.util.List;
@@ -26,6 +27,8 @@
IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock);
List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock);
+ List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId, Integer strainId);
+
/**
* 统计产量
* @param farmProductStock
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
index e08e23f..c502f69 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
@@ -1,6 +1,7 @@
package org.springblade.modules.farmplant.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.modules.farmplant.entity.FarmProductStock;
import org.springblade.modules.farmplant.mapper.FarmProductStockMapper;
import org.springblade.modules.farmplant.service.FarmProductStockService;
@@ -35,6 +36,11 @@
return baseMapper.selectFarmProductStockPages(farmProductStock);
}
+ @Override
+ public List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId, Integer strainId) {
+ return baseMapper.findFarmProductStockByFarmIdAndStrainId(farmId,strainId);
+ }
+
/**
* 统计产量
* @param farmProductStock
--
Gitblit v1.9.3