#

zjj

2024-06-05 1af2d32c0918804bf76f1cf941d2cd19bd70d884

#

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

@@ -2595,18 +2595,18 @@
                        boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发
                        wrkEnable = true;
                        if (sign){
                            wrkMastSta.setWrkSts(1);
                            try{
                                wrkMastStaMapper.updateById(wrkMastSta);
                                log.error("更新小车任务成功");
                            }catch (Exception e){
                                log.error("更新小车任务失败");
                            }
                            rgvThread.setPakMk(false);
                            boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd(),"2526");
                            if (signMap){
                                Thread.sleep(300);
                                wrkMastSta.setWrkSts(1);
                                try{
                                    wrkMastStaMapper.updateById(wrkMastSta);
                                    return;
                                }catch (Exception e){
                                    log.error("更新小车任务失败");
                                }
                                break;
                                return;
//                                break;
                            }else {
                                log.error("3864行，货物搬运任务：工作号{}所属任务下发后地图同步失败",wrkMastSta.getWrkNo());
                                Thread.sleep(500);

 src/main/java/com/zy/asrs/utils/RouteUtils.java

@@ -18,11 +18,11 @@
    }};

    public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
        add(100);add(101);
//        add(100);add(101);
    }};

    public static final List<Integer> MERGE_STA_NO_THREE = new ArrayList<Integer>() {{
        add(106);add(107);
//        add(106);add(107);
    }};

    public static final List<Integer> MERGE_STA_NO_FOUR = new ArrayList<Integer>() {{