#

luxiaotao1123

2022-12-08 6559c51b0ddc00a14a7589bc57bbfec4a01a0b2f

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

@@ -114,11 +114,11 @@
        int end = 30;
        int dualCrnNo;
        switch (sourceStaNo) {
            case 107:
            case 203:
                whsType = 1;
                dualCrnNo = 2;
                break;
            case 118:
            case 102:
                whsType = 2;
                start = 31;
                end = 32;
@@ -167,7 +167,24 @@
                        }
                    }
                } else {

                    if (Utils.isShallowLoc(slaveProperties, locNo)) {
                        continue;
                    }
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(shallowLoc)) {
                                if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                    locMast = shallowLoc;
                                    crnNo = locMast.getCrnNo();
                                    break;
                                }
                            }
                        }
                    }
                }
            }
        }
@@ -178,21 +195,36 @@
                    .eq("loc_sts", "D").ge("row1", start).le("row1", end));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            int locCrnNo;
                            if (whsType == 1) {
                                locCrnNo = 2;
                            } else {
                                locCrnNo = 3;
                    if (whsType == 1) {
                        LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
                        if (null != locMast0) {
                            // 浅库位符合尺寸检测
                            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                                // 浅库位对应堆垛机必须可用且无异常
                                if (basCrnpService.checkSiteError(dualCrnNo, true)) {
                                    crnNo = dualCrnNo;
                                    locMast = locMast0;
                                    break;
                                }
                            }
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locCrnNo, true)) {
                                crnNo = locCrnNo;
                                locMast = locMast0;
                                break;
                        }
                    } else {
                        if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
                            continue;
                        }
                        String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                        // 检测目标库位是否为空库位
                        LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                        if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                            if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                                // 因库位移转、需预留空库位
                                if (locMastService.checkEmptyCount(shallowLoc)) {
                                    if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                        locMast = shallowLoc;
                                        crnNo = locMast.getCrnNo();
                                        break;
                                    }
                                }
                            }
                        }
                    }
@@ -201,14 +233,16 @@
        }

        // 如果没有相近物料，则按规则轮询货架
        if (null == locMast && whsType == 1) {
            if (curRow == 2) {
                curRow = 30;
            } else if (curRow == 30) {
                curRow = 2;
        if (null == locMast) {
            if (whsType == 1) {
                if (curRow == 2) {
                    curRow = 30;
                } else if (curRow == 30) {
                    curRow = 2;
                }
            }
            if (basCrnpService.checkSiteError(dualCrnNo, true)) {
               crnNo = dualCrnNo;
                crnNo = dualCrnNo;
            }
        }

@@ -240,22 +274,64 @@

        // 1.当检索库排为浅库位排时，优先寻找当前库排的深库位排
        if (locMast == null) {
            List<Integer> rows = Utils.getGroupLoc(curRow);
            if (whsType == 1) {
                List<Integer> rows = Utils.getGroupLoc(curRow);

            List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
            if (!Cools.isEmpty(locMasts)) {
                Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
                for (LocMast one : locMasts) {
                    if (one.getRow1().equals(innermostRow)) {
                        locMast = one;
                        break;
//                Iterator<Integer> iterator = rows.iterator();
//                while (iterator.hasNext()) {
//                    Integer next = iterator.next();
//                    if (next.equals(17) || next.equals(18)) {
//                        iterator.remove();
//                    }
//                }

                List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
                if (!Cools.isEmpty(locMasts)) {
                    Integer innermostRow = Utils.getOutLayerRow(locMasts.get(0).getLocNo(), false);
                    for (LocMast one : locMasts) {
                        if (one.getRow1().equals(innermostRow)) {
                            locMast = one;
                            break;
                        }
                    }
                }
            }
            // 因库位移转、需预留空库位 todo:luxiaotao
                // 因库位移转、需预留空库位 todo:luxiaotao
//            if (!locMastService.checkEmptyCount(locMast)) {
//                locMast = null;
//            }
            } else {
                if (Utils.isShallowLoc(slaveProperties, curRow)) {
                    Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                    locMast = locMastService.queryFreeLocMast0(deepRow, locTypeDto.getLocType1());
                    // 因库位移转、需预留空库位
                    if (locMast !=null && !locMastService.checkEmptyCount(locMast)) {
                        locMast = null;
                    }
                }

                if (Cools.isEmpty(locMast)) {
                    locMast = locMastService.queryFreeLocMast0(curRow, locTypeDto.getLocType1());
                    // 因库位移转、需预留空库位
                    if (!locMastService.checkEmptyCount(locMast)) {
                        locMast = null;
                    }

                    // 目标库位 ===>> 浅库位， 则校验其深库位是否为 F D X
                    if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
                        LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
                            locMast = null;
                        }
                    }
                    // 目标库位 ===>> 深库位， 则校验其浅库位是否为 O
                    if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
                        LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
                        if (!shallowLoc.getLocSts().equals("O")) {
                            locMast = null;
                        }
                    }
                }
            }
        }

        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位