#

luxiaotao1123

2022-10-24 04fc5c36fae9add2eeaac561c3388b5a70830992

#

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

@@ -112,14 +112,17 @@
        StartupDto startupDto = new StartupDto();
        int start = 2;
        int end = 30;
        int dualCrnNo;
        switch (sourceStaNo) {
            case 107:
                whsType = 1;
                dualCrnNo = 2;
                break;
            case 118:
                whsType = 2;
                start = 31;
                end = 32;
                dualCrnNo = 3;
                break;
            default:
                throw new CoolException("数据异常，请联系管理员");
@@ -150,23 +153,21 @@
        if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
            for (String locNo : locNos) {
                LocMast locMast0 = locMastService.findOutMost(locNo);
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        int locCrnNo;
                        if (whsType == 1) {
                            locCrnNo = 2;
                        } else {
                            locCrnNo = 3;
                        }
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locCrnNo, true)) {
                            crnNo = locCrnNo;
                            locMast = locMast0;
                            break;
                if (whsType == 1) {
                    LocMast locMast0 = locMastService.findOutMost(locNo);
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(dualCrnNo, true)) {
                                crnNo = dualCrnNo;
                                locMast = locMast0;
                                break;
                            }
                        }
                    }
                } else {

                }
            }
        }
@@ -206,9 +207,8 @@
            } else if (curRow == 30) {
                curRow = 2;
            }
            int crnNo1 = 2;
            if (basCrnpService.checkSiteError(crnNo1, true)) {
               crnNo = crnNo1;
            if (basCrnpService.checkSiteError(dualCrnNo, true)) {
               crnNo = dualCrnNo;
            }
        }