#

lsh

2024-07-16 e6e6238b421ee2ddbdb8f43eef767fca5a7b185c

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -3379,6 +3379,26 @@
                if (!staProtocol.isLoading()){
                    continue;
                }
                StaProtocol staProtocol120 = devpThread.getStation().get(120);
                if (staProtocol120 == null) {
                    continue;
                } else {
                    staProtocol120 = staProtocol120.clone();
                }

                if (staProtocol120.isLoading()){
                    continue;
                }
                StaProtocol staProtocol121 = devpThread.getStation().get(121);
                if (staProtocol121 == null) {
                    continue;
                } else {
                    staProtocol121 = staProtocol121.clone();
                }

                if (staProtocol121.isLoading()){
                    continue;
                }
//                if (!staProtocol.getWorkNo().equals(wrkMast131.getWrkNo())){
//                    log.info("站点工作号={} 与贴标工作号={} 不一致，异常！",staProtocol.getWorkNo(),wrkMast131.getWrkNo().shortValue());
//                }
@@ -3736,6 +3756,19 @@
                                continue;
                            }
                        }
                        BasDevp basDevpS = basDevpService.selectById(wrkMastSta.getStaStart());
                        if (!basDevpS.getAutoing().equals("Y") || !basDevpS.getLoading().equals("Y") || basDevpS.getWrkNo()!=wrkMastSta.getWrkNo().intValue()){
                            continue;
                        }
                        StaProtocol staProtocols = devpThread.getStation().get(basDevpS.getDevNo());
                        if (staProtocols == null) {
                            log.info(date+"取放任务下发：未查询到站点信息："+wrkMastSta);
                            continue;
                        }
                        if (!staProtocols.isAutoing() || !staProtocols.isLoading() || staProtocols.getWorkNo() != wrkMastSta.getWrkNo().intValue()){
                            continue;
                        }


                        log.info(date+"取放任务下发：小车工作档："+wrkMastSta);
                        log.info(date+"取放任务下发：目标站状态："+basDevp);
@@ -4206,7 +4239,15 @@
                        && rgvProtocol.getStatusType1() == RgvStatusType.IDLE
                        && rgvProtocol.getStatusType2() == RgvStatusType.IDLE
                ) {

                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
//                    Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMap.getRgvNo(), basRgvMap.getEndRoute()); //获取合并干涉项
//                    List<Integer> route = RouteUtils.getRoute(basRgvMap.getStartRoute(),fallMerge);
//                    List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route ,route);
//                    if (!wrkMastStaList.isEmpty()){
//                        log.info("小车存在可执行任务，跳过避让！！4214");
//                        return;
//                    }
                    if (rgvProtocol.getRgvPosI().equals(basRgvMap.getStartRoute())){
//                    if (!RouteUtils.RgvRunStaSign(rgvProtocol.getRgvPosI(),RouteUtils.RouteIndexFarMas(rgvProtocol.getRgvNo(),rgvRunSta[rgvProtocol.getRgvNo()-1]),rgvProtocol.getRgvNo())){
//                    if (!RouteUtils.RgvRunStaSign(rgvProtocol.getRgvPosI(),rgvRunSta[rgvProtocol.getRgvNo()-1],rgvProtocol.getRgvNo())){