初始化未完成

dubin

1 天以前 cc4e0bd14edeeb43268216f18c70be62e482b8f0

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

@@ -172,6 +172,11 @@
//            }
            int rowCount = params[0];
            int nearRow = params[3];
            int MIN_SPARE_SLOTS = 0;

            if (rowLastno.getTypeId() == 1){
                MIN_SPARE_SLOTS = 2;
            }

            // 只取数量判断，避免拉整 list
            int availableLocCount = locMastService.selectCount(new EntityWrapper<LocMast>()
@@ -180,7 +185,7 @@
                    .eq("whs_type", rowLastnoType.getType().longValue()));
            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
                    .eq("crn_no", crnNo).le("io_type", 100));
            if (availableLocCount - crnCountO <= 2) { // 可以提成常量，比如 MIN_SPARE_SLOTS = 2
            if (availableLocCount - crnCountO <= MIN_SPARE_SLOTS) { // 可以提成常量，比如 MIN_SPARE_SLOTS = 2
                log.error("{}号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", crnNo, JSON.toJSONString(locTypeDto), attempt);
                attempt++;
                continue;
@@ -242,15 +247,21 @@

        //此程序用于优化堆垛机异常时的运行时间
        Optional<CrnRowInfo> infoOpt = findAvailableCrnAndNearRow(rowLastno, curRow, crnNumber, times, findLocNoAttributeVo, locTypeDto, rowLastnoType);
        if (!infoOpt.isPresent()) {
            throw new CoolException("无可用堆垛机");
        }
        if (infoOpt.isPresent()) {
//            throw new CoolException("无可用堆垛机");
        CrnRowInfo info = infoOpt.get();
        crnNo = info.getCrnNo();
        nearRow = info.getNearRow();
        curRow = info.getCurRow();
        rowCount = info.getRowCount();
        times = info.getTimes();
        }
//        CrnRowInfo info = infoOpt.get();
//        crnNo = info.getCrnNo();
//        nearRow = info.getNearRow();
//        curRow = info.getCurRow();
//        rowCount = info.getRowCount();
//        times = info.getTimes();


        boolean signRule1 = false;
@@ -440,12 +451,14 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .orderBy("lev1", true).orderBy("bay1", false));
                    .orderBy("lev1", true).orderBy("bay1", true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {

                    if (locMast1.getCrnNo() == 2) {
                    String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
                    LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
@@ -453,6 +466,11 @@
                        locMast = locMast2;
                        break;
                    }
                    } else if (locMast1.getCrnNo() == 1) {
                        locMast = locMast1;
                        break;
                    }

                } else {
                    if (!Cools.isEmpty(locMast1)) {
                        locMast = locMast1;
@@ -505,9 +523,10 @@
        // 递归查询
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
            // 当前巷道无空库位时，递归调整至下一巷道，检索全部巷道无果后，跳出递归
            if (times < rowCount * 2) {
            if (times <= rowCount * 2) {
                times = times + 1;
                return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
//                return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
                return getLocNoRun(5, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
            }
//            // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
//            if (locTypeDto.getLocType1() < 2) {