From a12500e11babc4d2512013a56b0cb900f7f7e3a6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 17 三月 2025 09:31:33 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 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 d8e44fe..65e1f63 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;
@@ -373,6 +374,17 @@
         agvLocMast.setModiTime(new Date());
         this.updateById(agvLocMast);
     }
+
+    public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType,String ctnNo) {
+        AgvLocMast agvLocMast = this.selectById(locNo);
+        agvLocMast.setLocSts(locSts);
+        agvLocMast.setBarcode(barcode);
+        agvLocMast.setLocType2(containerType);
+        agvLocMast.setCtnNo(ctnNo);
+        agvLocMast.setModiTime(new Date());
+        this.updateById(agvLocMast);
+    }
+
     public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType,String locType,Short locType3) {
         AgvLocMast agvLocMast = this.selectById(locNo);
         agvLocMast.setLocSts(locSts);
@@ -398,7 +410,7 @@
     @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));
 
     }
 
@@ -414,4 +426,22 @@
         return this.baseMapper.queryContainerTypeByLocType1(locType1);
     }
 
+    @Override
+    public List<AgvLocMast> selectDistinctLocByLevAndFloor(int lev, int floor) {
+
+        return this.agvLocMastMapper.selectDistinctLocByLevAndFloor(lev,floor);
+    }
+
+    @Override
+    public List<AgvLocMast> selectDistinctLocByLevAndFloorMaprow1(int lev, int floor) {
+
+        return this.agvLocMastMapper.selectDistinctLocByLevAndFloorMaprow1(lev,floor);
+    }
+
+    @Override
+    public List<AgvLocMast> selectDistinctLocByLevAndFloorMapbay1(int lev, int floor) {
+
+        return this.agvLocMastMapper.selectDistinctLocByLevAndFloorMapbay1(lev,floor);
+    }
+
 }

--
Gitblit v1.9.1