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/service/LocMastService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index a7f45fb..db7cb1d 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -16,12 +16,17 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast1(Integer row, Short locType1);
+ LocMast queryFreeLocMast1(Integer row, Short locType1 ,int channelMax);
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast2(Integer row, Short locType1, Integer bay);
+ LocMast queryFreeLocMast2(Integer row, Short locType1, Short locType2);
+
+ /**
+ * 妫�绱㈠彲鐢ㄥ簱浣�
+ */
+ Integer queryFreeLocMastCount(Integer row, Short locType1, Short locType2);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
--
Gitblit v1.9.1