#

Junjie

3 天以前 83beaad1e6b65377ded9e17302298ffc4b562441

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

@@ -284,13 +284,6 @@
            throw new CoolException(crnNo + "号堆垛机到达空库位预留上限！尺寸规格：" + (locTypeDto.getLocType1() == 1 ? "高" : "低"));
        }

        if (crnNo == 1) {
            if (wrkMasts.size() >= 1) {
                log.error(crnNo + "号堆垛机已达到入库控制上限！！！ 任务数量： {}， 控制数量：{}", wrkMasts.size(), 1);
                throw new CoolException(crnNo + "号堆垛机已达到入库控制上限！");
            }
        }

        LocMast locMast = null;
        if (staDescId == 10) {
            //搜索空托盘
@@ -506,6 +499,18 @@
                    break;
                }
            }

            if(targetLocMast == null) {
                //深库位找完都没找到，直接找浅库位
                for (LocMast locMast : locMastsList) {
                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
                        continue;
                    }

                    //空库位直接选择
                    targetLocMast = locMast;
                }
            }
        }

        return targetLocMast;