From 87c7a14ff9309bcfcc3bff9d071a77a1f8d797de Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 三月 2024 15:33:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs 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 2271da4..c3dfff6 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -12,11 +12,18 @@
 
     public void initLocFloor1();
 
-    public void initLocFloor3();
+    public void initLocFloor2();
 
     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);
+    public void updateLocStsByLocNo(String locNo, String locSts, String barcode);
+
+    public List<String> queryGroupEmptyStock(int floor);
+
+    List<AgvLocMast> selectLocByLevAndFloor(int lev, int floor);
+
+    AgvLocMast selectEmptyZpallet(int type);
+
 }

--
Gitblit v1.9.1