From b1aa89d5cc6058a04a848f5d6973f581757eed3f Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期五, 22 十一月 2024 13:34:08 +0800 Subject: [PATCH] #拐点加大惩罚 --- src/main/java/com/zy/asrs/utils/Utils.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index bff15bf..120906d 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -454,12 +454,22 @@ NavigateMapData mapData = new NavigateMapData(z);//鑾峰彇鍦板浘鏁版嵁 int[][] data = mapData.getData(-1, null, currentShuttleId == null ? null : Utils.getShuttlePoints(0, z));//杞藉叆鍏ㄩ儴杞﹁締 + int moveBay = 23;//閬胯璧峰鍒� + int bay = Utils.getBay(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠鍒� + if (bay > 1 && bay <= 30) { + moveBay = 23; + } else if (bay > 30 && bay <= 45) { + moveBay = 39; + } else if (bay > 45) { + moveBay = 50; + } + int distY = -1; int distX = -1; int distZ = -1; //鑾峰彇閬胯搴撲綅 String distLocNo = null; - for (int y = 23; y <= 56; y++) { + for (int y = moveBay; y <= 56; y++) { boolean searchFlag = true; for (int x = 10; x <= 11; x++) { if (data[x][y] < 0 || data[x][y] == 66) { @@ -481,6 +491,10 @@ continue; } + if (distLocMast.getLocSts().equals("X")) { + continue;//璋冭繃绂佺敤搴撲綅 + } + //鍒ゆ柇璇ュ簱浣嶆槸鍚﹀瓨鍦ㄥ伐浣滄。 EntityWrapper<WrkMast> wrapper = new EntityWrapper<>(); wrapper.eq("loc_no", locNo); -- Gitblit v1.9.1