#

Administrator

2023-06-10 24b0b06a6e13f74db86e2c643097b37cada07d58

#

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -700,6 +700,7 @@
            for (LocMast mast : insideLocMast) {
                if (!mast.getLocSts().equals("D")
                        && !mast.getLocSts().equals("F")
                        && !mast.getLocSts().equals("O")
                        && !mast.getLocSts().equals("X")) {
                    //D、F、X(不能选定这个外侧库位)
                    return true;

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

@@ -193,6 +193,13 @@
                if (locMast != null) {
                    //找到库位，返回dto
                    sign=true;
                } else {
                    //单品没有找到库位，找高频混放区域库位
                    locMast = getLocNoStep3(locTypeDto, crnNos);
                    if (locMast != null) {
                        //找到库位，返回dto
                        sign=true;
                    }
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
@@ -325,7 +332,7 @@
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                            if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
                                locMast = locMast0;
                                break;
                            }
@@ -352,7 +359,7 @@
                    // 浅库位对应堆垛机必须可用且无异常
                    if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount(locMast0, 10)) {
                        if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
                            locMast = locMast0;
                            break;
                        }