From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

---
 src/main/java/com/zy/asrs/service/AgvLocMastService.java |    3 ++-
 1 files changed, 2 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 d2a0db2..1f8169c 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocMastService.java
@@ -22,11 +22,12 @@
 
     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);
 

--
Gitblit v1.9.1