From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index e0edc63..060173b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.AgvLocMast;
 import com.zy.asrs.entity.AgvLocRule;
 import com.zy.asrs.mapper.AgvLocMastMapper;
@@ -409,7 +410,14 @@
     @Override
     public AgvLocMast selectEmptyZpallet(int type, int floor) {
 
-        return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type).eq("floor",floor));
+        return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type).eq("floor",floor).orderBy("lev1",true));
+
+    }
+
+    @Override
+    public AgvLocMast select30EmptyZpallet() {
+
+        return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",30).eq("floor",1).eq("lev1",2));
 
     }
 

--
Gitblit v1.9.1