From b2f73c3651215813b0fd9ab06bdf5842c7787a8b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 20 四月 2024 15:08:33 +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 c265e3a..963efd9 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -2748,8 +2748,9 @@ && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊¢兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴 && rgvProtocol.getTaskNo1()==0 && rgvProtocol.getStatusType1() == RgvStatusType.IDLE + && rgvThread.isPakMk() // && rgvProtocol.getTaskNo2()==0 - ) { + ){ BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo()); if (rgvProtocol.getRgvPosI().equals(basRgvMap.getStartRoute())){ continue; -- Gitblit v1.9.1