From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java |   82 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 78 insertions(+), 4 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 63305a3..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;
@@ -26,7 +27,7 @@
     }
 
     public void initLocFloor1() {
-        this.insertBatch(getLocMastList(1, 32, 1, 20, 1, 1, 1));
+        this.insertBatch(getLocMastList(1, 22, 1, 39, 2, 2, 1));
     }
 
 
@@ -47,7 +48,7 @@
             for (int bay = bayIndex; bay <= bayMax; bay++) {
                 for (int lev = levIndex; lev <= levMax; lev++) {
 
-                    if(!checkLocExistFloor1(row,bay)){
+                    if(!checkLocExistFloor1_2(row,bay)){
                         continue;
                     }
 
@@ -75,7 +76,51 @@
         return  agvLocMastList;
     }
 
-    private boolean checkLocExistFloor1(int row, int bay){
+    private boolean checkLocExistFloor1_2(int row, int bay){
+        if(row == 4 && bay == 19){
+            return false;
+        }
+
+        if(row == 5 && (bay == 3 || bay == 8 || bay == 13 || bay == 18 || bay == 19 || bay == 24 || bay == 29)){
+            return false;
+        }
+
+        if((row == 6 || row == 7) && bay == 39){
+            return false;
+        }
+
+        if((row == 9 || row == 10 || row == 14 || row == 18) && (bay == 3 || bay == 8 || bay == 13 || bay == 14 || bay == 19 || bay == 24 || bay == 29 || bay == 30)){
+            return false;
+        }
+        if ((row == 10 || row == 11) && (bay == 7 || bay == 12 || bay == 23 || bay == 28 )) {
+            return false;
+        }
+        if ((row == 9 || row == 13) && bay == 35 ) {
+            return false;
+        }
+        if(row == 13 && (bay == 18 || bay == 19 || bay == 20)){
+            return false;
+        }
+        if(row == 9 && bay == 18){
+            return false;
+        }
+        if((row == 14 || row == 15) && bay > 37){
+            return false;
+        }
+        if(row >= 16 && bay >= 35){
+            return false;
+        }
+        if((row >= 2 && row <= 21) && bay == 17){
+            return false;
+        }
+
+        if(bay >= 33 && bay <= 34){
+            return false;
+        }
+
+        return true;
+    }
+    private boolean checkLocExistFloor1_1(int row, int bay){
         if(row <= 2 && bay >= 20){
             return false;
         }
@@ -329,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);
@@ -354,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));
 
     }
 
@@ -370,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