#

zjj

2024-02-27 17605f24bcef3982b338cacaca30077f9a40ce16

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

@@ -2138,7 +2138,10 @@
            Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
            Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //获取合并干涉项
            basRgvMapCurrent.setLockEndRoute(fallMerge);
            basRgvMapMapper.updateById(basRgvMapCurrent);
            Integer i = basRgvMapMapper.updateById(basRgvMapCurrent);
            if (i>0){
                log.error("{}号车更新结束锁,{}",basRgvMapCurrent.getRgvNo(),JSON.toJSONString(basRgvMapCurrent));
            }

            //更新另一台小车地图
            Integer rgvNoOther = basRgvMapCurrent.getRgvNoOther(basRgvMapCurrent.getRgvNo());
@@ -2146,7 +2149,10 @@
            List<Integer> integers = RouteUtils.RouteMapCurrentFar(fallMerge, basRgvMapCurrent.getLockStartRoute());
            Integer lockEndRoute = RouteUtils.RouteMapOtherFarStnNo(integers, basRgvMapCurrent.getLockStartRoute());//另一台小车可活动最远位置
            basRgvMapOther.setEndRoute(lockEndRoute);
            basRgvMapMapper.updateById(basRgvMapOther);
            Integer i1 = basRgvMapMapper.updateById(basRgvMapOther);
            if (i1>0){
                log.error("{}号车更新结束位置,{}",basRgvMapOther.getRgvNo(),JSON.toJSONString(basRgvMapOther));
            }
            return true;
        }catch (Exception e){
            log.error("小车地图更新出错！");
@@ -2341,10 +2347,12 @@
                        wrkEnable = true;
                        if (sign){
                            boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd());
                            Thread.sleep(300);
                            if (signMap){
                                wrkMastSta.setWrkSts(1);
                                try{
                                    wrkMastStaMapper.updateById(wrkMastSta);
                                    return;
                                }catch (Exception e){
                                    log.error("更新小车任务失败");
                                }