From 1d393e4ff451df7937a199d5589a45459695970e Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 22 十二月 2022 13:23:28 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index da0c9cc..fb5c3c9 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3332,6 +3332,7 @@ Iterator<String> iterator = crn2DemoLocs.iterator(); while (iterator.hasNext()) { String next = iterator.next(); + if (!Cools.isEmpty(this.hasCar(next))) { continue; } String lastLoc = crn2LastLoc; if (!Cools.isEmpty(lastLoc)) { if (!lastLoc.substring(2, 7).equals(next.substring(2, 7)) @@ -3448,7 +3449,7 @@ } steCommand.setTaskMode(originByLoc); - steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue()); + steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue()); steCommand.setBay(steProtocol.getBay()); steCommand.setLev(steProtocol.getLev()); -- Gitblit v1.9.1