From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 208fff4..46de5b0 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -15,6 +15,12 @@
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
+ LocMast queryFreeLocMast1(@Param("row") Integer row, @Param("locType1") Short locType1 ,@Param("channelMax") int channelMax);
+
+ LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2);
+
+ Integer queryFreeLocMastCount(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2);
+
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
--
Gitblit v1.9.1