From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/asrs/service/LocMastService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 01e3905..38b0869 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import java.util.List;
@@ -17,6 +16,11 @@
* 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
*/
List<LocMast> selectAreaEmpty(Short locType1, Integer locType3);
+
+ /**
+ * 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
+ */
+ List<LocMast> selectAreaEmptyByLev(Short locType1, Integer locType3, Integer lev);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -47,6 +51,8 @@
LocMast findNearloc(String locNo);
+ LocMast findInnerLoc(String locNo);
+
List<LocMast> selectAllPeakLoc();
Boolean checkAllLocEmpty(List<String> groupOuterLoc);
@@ -60,4 +66,5 @@
Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev);
+ void updateByLocNo(LocMast locMast);
}
--
Gitblit v1.9.1