From 5469a622f9f76a1bd7696937cd418e28eea8e1c9 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 29 二月 2024 15:45:26 +0800 Subject: [PATCH] #双车 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 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 1e62e56..6a20afa 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -2342,16 +2342,32 @@ } // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤 - if ( - rgvProtocol.getStatusType() == RgvStatusType.IDLE && - rgvProtocol.getModeType() == RgvModeType.AUTO - && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊¢兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴 - && (rgvProtocol.getTaskNo1()==0 || rgvProtocol.getTaskNo1()==9999) - + if (rgvProtocol.getStatusType() == RgvStatusType.IDLE && + rgvProtocol.getModeType() == RgvModeType.AUTO + && rgvProtocol.getLoaded1()==0 //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊¢兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴 + && (rgvProtocol.getTaskNo1()==0) ) { BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo()); - basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); - rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute()); + + Integer rgvNoOther = basRgvMap.getRgvNoOther(rgvProtocol.getRgvNo()); + RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNoOther); + RgvProtocol rgvProtocolOther = rgvThreadOther.getRgvProtocol(); + if (rgvProtocolOther == null) { + continue; + }else { + rgvProtocolOther = rgvProtocolOther.clone(); + } + if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE + && rgvProtocolOther.getModeType() == RgvModeType.AUTO + && rgvProtocolOther.getLoaded1()==0 + && (rgvProtocolOther.getTaskNo1()==0) + ){ + basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); + rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute()); + } + + + } } }catch (Exception e){ -- Gitblit v1.9.1