From de1a78dd2f4cfdb6663a1134083dd74f750faae5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/service/AgvLocMastService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvLocMastService.java b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
index b8e9f7c..1f8169c 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -12,18 +12,25 @@
public void initLocFloor1();
+ public void initLocFloor2();
+
public void initLocFloor3();
List<AgvLocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
void updateLocType2ByRBL(Integer locType2, AgvLocRule locRule);
- public void updateLocStsByLocNo(String locNo, String locSts, String barcode);
+ public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType);
+ public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType,String locType,Short locType3);
public List<String> queryGroupEmptyStock(int floor);
List<AgvLocMast> selectLocByLevAndFloor(int lev, int floor);
- AgvLocMast selectEmptyZpallet(int type);
+ AgvLocMast selectEmptyZpallet(int type, int floor);
+
+ AgvLocMast selectEmptyZpalletByLocType1(int type);
+
+ public List<String> queryContainerTypeByLocType1(Short locType1);
}
--
Gitblit v1.9.1