From 1596ce91095ad30f781006a2cfa5d856d3ac9416 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 09 九月 2023 11:00:45 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 33227ea..d153b29 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -23,7 +23,7 @@
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
Integer selectEmptyLocCount(@Param("crnNo") Integer crnNo);
- List<LocMast> queryFreeLocMast2(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
+ List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
LocMast selectAvailableNearLocDesc(@Param("groupLoc") List<String> groupOuterLoc);
@@ -35,4 +35,8 @@
List<LocMast> selectLocByLev(Integer lev);
+ List<LocMast> selectEmptyByLocNos(@Param("locNos") List<String> locNos);
+
+ Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev);
+
}
--
Gitblit v1.9.1