#

luxiaotao1123

2022-10-24 04bd02d1acaa4715fc7d9b3d31d7769c04b3a31f

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

@@ -10,7 +10,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -111,21 +110,19 @@
     */
    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:
            case 107:
                whsType = 1;
                start = 1;
                end = 14;
                break;
            case 203:
            case 118:
                whsType = 2;
                start = 8;
                end = 21;
                start = 31;
                end = 32;
                break;
            default:
                throw new CoolException("检索库位失败，请联系管理员");
                throw new CoolException("数据异常，请联系管理员");
        }
        // 生成工作号
        int workNo = getWorkNo(0);
@@ -137,24 +134,35 @@
        int sRow = rowLastno.getsRow();          // 起始列
        int eRow = rowLastno.geteRow();          // 终止列
        int crn_qty = rowLastno.getCrnQty();     // 堆垛机数量（巷道数量）
        int rowCount = eRow - sRow + 1;          // 库排总数
        int rowCount;
        if (whsType == 1) {
            rowCount = 2;
        } else {
            rowCount = 1;
        }
//        int rowCount = eRow - sRow + 1;          // 库排总数
        // 目标堆垛机号
        int crnNo = 0;
        // 目标库位
        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 locMast0 = locMastService.findOutMost(groupLoc);
                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(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                        if (basCrnpService.checkSiteError(locCrnNo, true)) {
                            crnNo = locCrnNo;
                            locMast = locMast0;
                            break;
                        }
@@ -169,14 +177,19 @@
                    .eq("loc_sts", "D").ge("row1", start).le("row1", end));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
                    LocMast locMast0 = locMastService.findOutMost(groupLoc);
                    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 (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                            if (basCrnpService.checkSiteError(locCrnNo, true)) {
                                crnNo = locCrnNo;
                                locMast = locMast0;
                                break;
                            }
@@ -187,60 +200,15 @@
        }

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

        int currentRow = 1;
        if (null == locMast) {
            Shelves shelves = new Shelves(rowCount, crn_qty);
            for (int i = 0; i < shelves.group; i ++) {
                if (i > 0) {
                    curRow = currentRow;
                }
                curRow = shelves.start(curRow);
                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;
                }
                if (basCrnpService.checkSiteError(crnNo1, true)) {
                    crnNo = crnNo1;
                    break;
                }
        if (null == locMast && whsType == 1) {
            if (curRow == 2) {
                curRow = 30;
            } else if (curRow == 30) {
                curRow = 2;
            }
            int crnNo1 = 2;
            if (basCrnpService.checkSiteError(crnNo1, true)) {
               crnNo = crnNo1;
            }
        }

@@ -265,7 +233,7 @@
        }

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

        // 开始查找库位 ==============================>>
@@ -276,7 +244,7 @@

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