#地图文件bug尝试修复

Junjie

2024-12-21 42f3380a98fff04674cf4ef95ea5e99f5c54f1fd

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

@@ -114,6 +114,8 @@
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private MatService matService;
    @Autowired
    private NavigateMapData navigateMapData;


    /**
@@ -888,7 +890,7 @@
//////                            devpThread.setPakMk(staProtocol.getSiteId(), false);
//////                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//////                            if (!result) {
//////                                News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
//////                                News.error("发布命令至输送线队列失败！！！ [plc编号{}]", devp.getId());
//////                            }
////
////                            barcodeThread.setBarcode("");//清理条码
@@ -938,8 +940,7 @@
                    if (basMap == null) {
                        //数据库中也不存在地图数据，从地图文件中获取
                        //载入地图
                        NavigateMapData mapData = new NavigateMapData(i);
                        List<List<MapNode>> lists = mapData.getJsonData(-1, null, null);//获取完整地图(包括入库出库)
                        List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//获取完整地图(包括入库出库)

                        //存入数据库
                        basMap = new BasMap();
@@ -2541,10 +2542,13 @@
                        //判断机械臂拣料站是否空闲
                        StaProtocol staProtocol303 = devpThread.getStation().get(303);
                        StaProtocol staProtocol317 = devpThread.getStation().get(317);
                        if (staProtocol303.isAutoing() && !staProtocol303.isLoading()) {

                        List<WrkMast> wrkMasts303 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 25).eq("sta_no", 303));
                        List<WrkMast> wrkMasts317 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 25).eq("sta_no", 317));
                        if (staProtocol303.isAutoing() && !staProtocol303.isLoading() && wrkMasts303.isEmpty()) {
                            //自动、无物
                            targetSta = (short) 303;
                        } else if (staProtocol317.isAutoing() && !staProtocol317.isLoading()) {
                        } else if (staProtocol317.isAutoing() && !staProtocol317.isLoading() && wrkMasts317.isEmpty()) {
                            //自动、无物
                            targetSta = (short) 317;
                        } else {