# 组托前先查询托盘码是否存在提示

whycq

2023-06-16 c382cb4559cf2606883e30efbbdf4bbce0465cf6

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

@@ -140,7 +140,7 @@
                end = 21;

                //203站分配2，3堆垛机
                crnNos.add(2);
//                crnNos.add(2);
                crnNos.add(3);

                //分配8，14，15，21排
@@ -193,6 +193,13 @@
                if (locMast != null) {
                    //找到库位，返回dto
                    sign=true;
                } else {
                    //单品没有找到库位，找高频混放区域库位
                    locMast = getLocNoStep3(locTypeDto, crnNos);
                    if (locMast != null) {
                        //找到库位，返回dto
                        sign=true;
                    }
                }
            } else if (matType == 2) {//高频类型入最外侧库位
                locMast = getLocNoStep3(locTypeDto, crnNos);
@@ -217,7 +224,7 @@

        if (!sign){
            //----------------2023.06.02兼容代码，后期库位规则符合要求后可删除------------------------
            //如果以上都找不到库位，则强制搜索1、2堆垛机空库位进行入库，保障3号堆垛机库位都是符合要求的
            //如果以上都找不到库位，则强制搜索2堆垛机空库位进行入库，保障3号堆垛机库位都是符合要求的
            EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
            wrapper.eq("loc_type1", locTypeDto.getLocType1());
            wrapper.in("crn_no", "2");
@@ -229,14 +236,9 @@
                    //内侧其他库位不是D、F、X。不能选取该库位
                    continue;
                }
                if(sourceStaNo==103 && mast.getRow1()>7)
                {
                    continue;
                }
                if(sourceStaNo==203 && mast.getRow1()<8)
                {
                    continue;
                }
                if(sourceStaNo==103 && mast.getRow1()>14) continue;
                if(sourceStaNo==103 && mast.getRow1()<8) continue;
                if(sourceStaNo==203 && mast.getRow1()<15) continue;
                //找到库位，返回dto
                locMast=mast;
                sign = true;
@@ -330,7 +332,7 @@
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            // 因库位移转、需预留空库位
                            if (locMastService.checkEmptyCount(locMast0, 10)) {
                            if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
                                locMast = locMast0;
                                break;
                            }
@@ -357,7 +359,7 @@
                    // 浅库位对应堆垛机必须可用且无异常
                    if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                        // 因库位移转、需预留空库位
                        if (locMastService.checkEmptyCount(locMast0, 10)) {
                        if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
                            locMast = locMast0;
                            break;
                        }