From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/service/AgvLocMastService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvLocMastService.java b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
index c3dfff6..6745ff3 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -18,7 +18,7 @@
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 List<String> queryGroupEmptyStock(int floor);
@@ -26,4 +26,8 @@
AgvLocMast selectEmptyZpallet(int type);
+ AgvLocMast selectEmptyZpalletByLocType1(int type);
+
+ public List<String> queryContainerTypeByLocType1(Short locType1);
+
}
--
Gitblit v1.9.1