#
LSH
2024-03-02 48302c5c7f85bfdd52dfd071d7a9ef8628d87667
#
2个文件已修改
29 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5464,6 +5464,9 @@
     * 小车地图更新  更新锁
     * */
    public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd){
        if (true){
            return true;
        }
//        List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
        //更新当前小车锁
src/main/java/com/zy/core/MainProcess.java
@@ -82,26 +82,26 @@
                    mainService.storeFinishedTwo();
//                    /////////////////////////////////////RGV调度/////////////////////////////////////
//                    i++;
//                    k++;
//                    if (i<7) {
//                        // RGV  ===>>  小车任务作业下发
//                        try{
//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
                    i++;
                    k++;
                    if (i<7) {
                        // RGV  ===>>  小车任务作业下发
                        try{
                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
//                            if (rgvIoExecuteSign){
//                                k = 0;
//                            } else if (k>7){
//                                k = 0;
//                                mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
//                            }
//                        }catch (Exception e){
//                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
//                        }
//                    }else {
//                        i = 0;
//                    }
                        }catch (Exception e){
                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
                        }
                    }else {
                        i = 0;
                    }
//                    //完成小车任务
//                    mainService.rgvCompleteWrkMastSta();
                    mainService.rgvCompleteWrkMastSta();
//                    /////////////////////////////////////RGV调度/////////////////////////////////////
//                    // 异常信息记录