Junjie
2023-06-02 ba8024b827f0ae2a42b5c060d0ca0cd62d8a4043
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -940,7 +940,7 @@
                continue;
            }
            // 入库深库位是否有非F、D库位进行校验
            // 入库深库位是否有非F、D、X库位进行校验
            if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
                continue;
            }
@@ -4308,6 +4308,18 @@
                    || Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
                    || Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){
                    Integer steNo = this.hasCarOfIdle(one.getLocNo());
                    if (steNo != null) {
                        //有小车
                        continue;
                    }
                    //检测当前库位内侧其他库位是否为D、F、X
                    if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
                        //内侧其他库位不是D、F、X。不能选取该库位
                        continue;
                    }
                    loc = one;
                    break;
                }