From e7949c7f0b4f66802003721d2e6c46797973d91b Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 29 三月 2024 09:20:15 +0800 Subject: [PATCH] 初始化库位和站点 --- src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 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 43c140a..a0485fc 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java @@ -50,10 +50,10 @@ } AgvLocMast loc = new AgvLocMast(); - String locRow = row < 10 ? "-00" + row : "-0" + row; - String locBay = bay < 10 ? "-00" + bay : "-0" + bay; - String locLev = lev < 10 ? "-0" + lev : "-" + lev; - String locNo = "YZ" + locRow + locBay + locLev + "@" + floor; + String locRow = row < 10 ? "_00" + row : "_0" + row; + String locBay = bay < 10 ? "_00" + bay : "_0" + bay; + String locLev = lev < 10 ? "_0" + lev : "_" + lev; + String locNo = "YZ" + locRow + locBay + locLev + "F" + floor; loc.setLocNo(locNo); loc.setLocSts("O"); loc.setRow1(row); @@ -73,11 +73,11 @@ } private boolean checkLocExistFloor2(int row, int bay){ - if(row <= 4 && bay >= 17){ + if(row <= 4 && bay >= 13){ return false; } - if(row <= 7 && bay >= 26){ + if(row <= 7 && bay >= 25){ return false; } @@ -94,6 +94,10 @@ } if(row == 21 && bay == 15){ + return false; + } + + if(row == 23 && bay == 29){ return false; } @@ -238,4 +242,9 @@ } + @Override + public List<String> queryContainerTypeByLocType1(Short locType1) { + return this.baseMapper.queryContainerTypeByLocType1(locType1); + } + } -- Gitblit v1.9.1