#

whycq

2024-03-05 8003a29d3f510adfa971ea6ebd23af1ccd7316c1

#

 src/main/java/com/zy/asrs/controller/AgvMapController.java

@@ -65,7 +65,7 @@
            int y = row;
            ////1楼
            //if(floor == 1){
                x = generateMap1Row(row);
            //    x = generateMap1Row(row);
            //    y = generateMap1Bay(bay);
            //}
            ////3楼

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -159,14 +159,6 @@

        if(code == 0){
            for(AgvWrkMast agvWrkMast : agvWrkMastList){
                //下发容器达到通知 （输送线）
                if("Y".equals(agvWrkMast.getMk())){
                    int containerArrivedCode = agvWrkMastService.containerArrived(agvWrkMast);
                    if(containerArrivedCode != 0){
                        log.error("容器到达指令下发失败");
                        continue;
                    }
                }
                //202.RCS取货中
                agvWrkMast.setWrkSts(202L);
                agvWrkMastService.updateById(agvWrkMast);

 src/main/java/com/zy/common/service/AgvCommonService.java

@@ -75,11 +75,11 @@
        // 目标库位
        AgvLocMast locMast = null;
        if(Cools.isEmpty(agvWaitPakinList)){
            return getLocNoRule(floor);
            return getLocNoRule(floor); // 1. 随机库位
        }

        //库位规则
        locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
        locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 按库位规则搜索
        if(!Cools.isEmpty(locMast)){
            return locMast;
        }
@@ -157,7 +157,7 @@
    库位规则查找
     */
    private AgvLocMast getLocByLocCodeRule(AgvWaitPakin agvWaitPakin, int floor) {
        if(Cools.isEmpty(agvWaitPakin.getBrand())){
        /*if(Cools.isEmpty(agvWaitPakin.getBrand())){
            return null;
        }

@@ -179,7 +179,7 @@
            if(!Cools.isEmpty(agvLocMast)){
                return agvLocMast;
            }
        }
        }*/

        return null;
    }