From 76310d416ead586c6ec375301ce675defac24f45 Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期六, 04 二月 2023 17:24:36 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++- src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 ++ 2 files changed, 9 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 008e2cc..a452bf7 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3857,10 +3857,16 @@ boolean success = true; List<String> insideLoc = Utils.getGroupInsideLoc(one.getLocNo()); for (String inside : insideLoc) { - if (!locMastService.selectById(inside).getLocSts().equals("O")) { + if (locMastService.selectById(inside).getLocSts().equals("P") || locMastService.selectById(inside).getLocSts().equals("R")) { success = false; break; } } + + Integer steNo = this.hasCar(one.getLocNo()); + if (steNo != null) { + continue; + } + if (success) { loc = one; break; diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index 2636d7a..a31efdc 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -89,6 +89,8 @@ // 鍐欐暟鎹� ID+鐩爣绔� case 2: write((StaProtocol)task.getData()); + Thread.sleep(300); + read(); break; default: break; -- Gitblit v1.9.1