#

luxiaotao1123

2022-10-24 f356d8015fce0d08652620970898d8dc841f2b16

#

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -59,4 +59,6 @@
    Boolean isOutMost(String locNo);

    List<String> getDemoNextLoc(Integer crnNo);

    Boolean isShuttle(String locNo);
}

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

@@ -63,4 +63,13 @@
        return this.baseMapper.getDemoNextLoc(crnNo);
    }

    @Override
    public Boolean isShuttle(String locNo) {
        int row = Utils.getRow(locNo);
        if (row >= 2 && row <= 30) {
            return Boolean.TRUE;
        }
        return Boolean.FALSE;
    }

}

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

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -642,7 +641,7 @@
                    }
                }
                // 库位移转
                this.locToLoc(crn, crnProtocol);
//                this.locToLoc(crn, crnProtocol);
                // 演示任务
                this.steMoveDemo(crn, crnProtocol);
            }
@@ -717,6 +716,10 @@
            wrkMast.setIoPri((double) 9999);
            wrkMastMapper.updateById(wrkMast);

            if (!locMastService.isShuttle(wrkMast.getLocNo())) {

            }

            // 目标库位 ===>> 最外层库位
            if (locMastService.isOutMost(wrkMast.getLocNo())) {
                // 判断小车是否在最外层库位，如果是则搬走，如果不是，则直接堆垛机入库