From 01a06fec1fd8fe51679487b6e6e4fdabd2031888 Mon Sep 17 00:00:00 2001
From: pengcheng <1432755665@qq.com>
Date: Tue, 12 Nov 2019 14:39:39 +0800
Subject: [PATCH] 合并分支
---
src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java | 2 ++
src/main/resources/mybatis/config/LocationMapper.xml | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java b/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
index 4d8e8a8..e4136b8 100644
--- a/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
+++ b/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
@@ -16,4 +16,6 @@ public interface LocationMapper extends BaseMapper<Location> {
int addList(@Param("locations") List<Location> locations);
+ Location getAllLocation(@Param("warehouseCode") String warehouseCode, @Param("type") String type);
+
}
\ No newline at end of file
diff --git a/src/main/resources/mybatis/config/LocationMapper.xml b/src/main/resources/mybatis/config/LocationMapper.xml
index 9ad4c31..901897f 100644
--- a/src/main/resources/mybatis/config/LocationMapper.xml
+++ b/src/main/resources/mybatis/config/LocationMapper.xml
@@ -83,4 +83,8 @@
</foreach>
</insert>
+ <select id="getAllLocation" resultType="com.huaheng.pc.config.location.domain.Location">
+ select max(iRow) as iRow,max(iColumn) as iColumn,max(iLayer) as iLayer,max(iGrid) as iGrid from location l where l.warehouseCode=#{warehouseCode} AND l.locationType=#{type}
+ </select>
+
</mapper>
\ No newline at end of file
--
libgit2 0.22.2