From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录,修复当农资库存为1时出库再退回,农资库存数据有误

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index c16f311..1a3840e 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -49,20 +49,52 @@
 	 * @return
 	 */
 	boolean saveLandInfo(@Param("land") Land land);
+
 	/**
 	 * 详情信息(自定义查询)
+	 * @param land
 	 * @return
 	 */
 	Land getLandInfo(@Param("land") LandVO land);
+
 	/**
 	 * 更新地块信息
-	 * @param farm
+	 * @param land
 	 * @return
 	 */
 	int updateLandById(@Param("land") Land land);
+	int updateLandAr(@Param("land") Land land);
+
 	List selectLandList(String userid);
-	List selectNum(String deptId);
-	List<Map<String, Object>> selectZAre(String deptId);
-	List<Map<String, Object>> selectSAre(String deptId);
-	List<Map<String, Object>> selectWAre(String deptId);
+
+	List selectNum(@Param("land") LandVO land);
+
+	List<Map<String, Object>> selectZAre(@Param("land") LandVO land);
+
+	List<Map<String, Object>> selectSAre(@Param("land") LandVO land);
+
+	List<Map<String, Object>> selectWAre(@Param("land") LandVO land);
+
+	/**
+	 * 地块列表(不分页)
+	 * @param land
+	 * @return
+	 */
+	List<LandVO> getLandList(@Param("land") LandVO land);
+
+	/**
+	 * 查询统计地块是否有轮廓(是否有圈出区域)
+	 * @param land 地块参数
+	 * @return
+	 */
+    List<Integer> getLandIsAreaStatistic(@Param("land") LandVO land);
+
+	/**
+	 * 根据品种查询对应地块
+	 * @param strainId 品种id
+	 * @return
+	 */
+	List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
+
+	List<Land> getByStrainIdFarmId(@Param("land")LandVO land);
 }

--
Gitblit v1.9.3