#

luxiaotao1123

2022-09-21 8f7b3268e25fcdd89422b354d43ce51ed0a71120

#

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

@@ -479,6 +479,10 @@
                continue;
            }

            // 置顶任务
            wrkMast.setIoPri((double) 9999);
            wrkMastMapper.updateById(wrkMast);

            // 目标库位 ===>> 最外层库位
            if (locMastService.isOutMost(wrkMast.getLocNo())) {
                // 判断小车是否在最外层库位，如果是则搬走，如果不是，则直接堆垛机入库
@@ -650,6 +654,10 @@
                    continue;
                }

                // 置顶任务
                wrkMast.setIoPri((double) 9999);
                wrkMastMapper.updateById(wrkMast);

                // 最外层库位，直接堆垛机出库
                if (locMastService.isOutMost(wrkMast.getSourceLocNo())) {
                    // 已经存在吊车执行任务时，则过滤
@@ -817,6 +825,10 @@
            return;
        }

        // 置顶任务
        wrkMast.setIoPri((double) 9999);
        wrkMastMapper.updateById(wrkMast);

        // 源库位 ===>> 最外层库位
        if (locMastService.isOutMost(wrkMast.getSourceLocNo())) {
            // 目标库位 ===>> 最外层库位
@@ -913,6 +925,7 @@
            }

        } else {

            // 当前组库位是否有穿梭车
            Integer steNo = this.hasCarOfIdle(wrkMast.getSourceLocNo());
            // 有小车
@@ -984,6 +997,10 @@
                            wrkMastMapper.setSteEmpty(wrkMast.getWrkNo());
                        }
                    } else {

                        // 把货搬到临时存放货位 todo:luxiaotao


                        // 小车行走到堆垛机待搬移点
                        if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
                            this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());