#

luxiaotao1123

2023-02-14 414f272bac3f455d23a0da75cc7a308b95d23567

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

@@ -28,12 +28,10 @@
public class CommonService {

    public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10);
        add(11);add(12);add(13);add(14);add(15);add(16);add(17);
        add(1);add(2);add(3);add(4);
    }};
    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
        add(18);add(19);add(20);
        add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30);
        add(5);add(6);add(7);add(8);add(9);add(10);add(11);
    }};

    @Autowired
@@ -110,20 +108,7 @@
     */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
        StartupDto startupDto = new StartupDto();
        int start = 2;
        int end = 30;
        switch (sourceStaNo) {
            case 107:
                whsType = 1;
                break;
            case 118:
                whsType = 2;
                start = 31;
                end = 32;
                break;
            default:
                throw new CoolException("数据异常，请联系管理员");
        }
        whsType = 1;
        // 生成工作号
        int workNo = getWorkNo(0);
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -134,13 +119,7 @@
        int sRow = rowLastno.getsRow();          // 起始列
        int eRow = rowLastno.geteRow();          // 终止列
        int crn_qty = rowLastno.getCrnQty();     // 堆垛机数量（巷道数量）
        int rowCount;
        if (whsType == 1) {
            rowCount = 2;
        } else {
            rowCount = 1;
        }
//        int rowCount = eRow - sRow + 1;          // 库排总数
        int rowCount = eRow - sRow + 1;          // 库排总数
        // 目标堆垛机号
        int crnNo = 0;
        // 目标库位
@@ -148,21 +127,15 @@

        // 靠近摆放规则 --- 同天同规格物料
        if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), sRow, eRow);
            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;
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                            locMast = locMast0;
                            break;
                        }
@@ -174,22 +147,16 @@
        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "D").ge("row1", start).le("row1", end));
                    .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
            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 (basCrnpService.checkSiteError(locCrnNo, true)) {
                                crnNo = locCrnNo;
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                                locMast = locMast0;
                                break;
                            }
@@ -200,15 +167,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;
                }
            }
            int crnNo1 = 2;
            if (basCrnpService.checkSiteError(crnNo1, true)) {
               crnNo = crnNo1;
            if (basCrnpService.checkSiteError(dualCrnNo, true)) {
                crnNo = dualCrnNo;
            }
        }

@@ -240,22 +208,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.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位