From 80b3b91a92e6a01ef849164e541c36eb321b60fd Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期三, 04 十月 2023 15:59:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs --- src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 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 e67221b..57250ad 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java @@ -57,6 +57,17 @@ for(int row=rowIndex; row<=rowMax; row++) { for (int bay = bayIndex; bay <= bayMax; bay++) { for (int lev = levIndex; lev <= levMax; lev++) { + if(row == 8 || row == 9){ + if((bay >=8 && bay <=11) + || (bay >= 20 && bay <=23) + || (bay>=37 && bay <=39) + || (bay>=50 && bay <=52) + || (bay>=63 && bay <=64) + || (bay>=79 && bay <=80)){ + continue; + } + } + AgvLocMast loc = new AgvLocMast(); String locRow = row < 10 ? "-00" + row : "-0" + row; String locBay = bay < 10 ? "-00" + bay : "-0" + bay; -- Gitblit v1.9.1