#

luxiaotao1123

2022-10-19 8cac5d40279933c61ce2ab120aef9d6302ae08e2

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

@@ -111,21 +111,20 @@
     */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
        StartupDto startupDto = new StartupDto();
        int start;
        int end;
        int start = 2;
        int end = 30;
        switch (sourceStaNo) {
            case 103:
                whsType = 1;
                start = 1;
                end = 14;
                break;
            case 203:
            case 107:
                whsType = 2;
                start = 8;
                end = 21;
                end = 17;
                break;
            case 118:
                whsType = 3;
                start = 18;
                break;
            default:
                throw new CoolException("检索库位失败，请联系管理员");
                whsType = 1;
                break;
        }
        // 生成工作号
        int workNo = getWorkNo(0);
@@ -144,17 +143,18 @@
        LocMast locMast = null;

        // 靠近摆放规则 --- 同天同规格物料
        if (!Cools.isEmpty(matNos)) {
        if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
            for (String locNo : locNos) {
                List<String> groupLoc = Utils.getGroupLoc(locNo);
                locMast = locMastService.findOutMost(groupLoc);
                if (null != locMast) {
                LocMast locMast0 = locMastService.findOutMost(groupLoc);
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast, locTypeDto)) {
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast.getCrnNo(), true)) {
                            crnNo = locMast.getCrnNo();
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                            locMast = locMast0;
                            break;
                        }
                    }
@@ -169,13 +169,14 @@
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
                    locMast = locMastService.findOutMost(groupLoc);
                    if (null != locMast) {
                    LocMast locMast0 = locMastService.findOutMost(groupLoc);
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast, locTypeDto)) {
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast.getCrnNo(), true)) {
                                crnNo = locMast.getCrnNo();
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                            }
                        }
@@ -185,8 +186,6 @@
        }

        // 如果没有相近物料，则按规则轮询货架

        int currentRow = 1;
        if (null == locMast) {
            Shelves shelves = new Shelves(rowCount, crn_qty);
            for (int i = 0; i < shelves.group; i ++) {
@@ -194,43 +193,9 @@
                if (curRow < 0) {
                    throw new CoolException("检索库位失败，请联系管理员");
                }
                currentRow = curRow;
                int crnNo1 = shelves.get(curRow);
                if (whsType == 1) {
                    switch (curRow) {
                        case 1:
                            curRow = 1;
                            break;
                        case 2:
                            curRow = 7;
                            break;
                        case 3:
                            curRow = 8;
                            break;
                        case 4:
                            curRow = 14;
                            break;
                        default:
                            throw new CoolException("检索库位失败，请联系管理员");
                    }
                } else {
                    switch (curRow) {
                        case 1:
                            curRow = 8;
                            break;
                        case 2:
                            curRow = 14;
                            break;
                        case 3:
                            curRow = 15;
                            break;
                        case 4:
                            curRow = 21;
                            break;
                        default:
                            throw new CoolException("检索库位失败，请联系管理员");
                    }
                    crnNo1 = crnNo1 + 1;
                Integer crnNo1 = shelves.get(curRow) + 1;
                if (whsType != 1) {
                    crnNo1 = whsType;
                }
                if (basCrnpService.checkSiteError(crnNo1, true)) {
                    crnNo = crnNo1;
@@ -260,7 +225,7 @@
        }

        // 更新库位排号
        rowLastno.setCurrentRow(currentRow);
        rowLastno.setCurrentRow(curRow);
        rowLastnoService.updateById(rowLastno);

        // 开始查找库位 ==============================>>
@@ -269,8 +234,17 @@
        if (locMast == null) {
            List<Integer> rows = Utils.getGroupLoc(curRow);

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