#

luxiaotao1123

2021-07-02 52241e80f87805d69b5682469f7f98fb14cbbf18

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

@@ -109,8 +109,11 @@
            case 126:
                whsType = 3;
                break;
            case 109:
            case 110:
                whsType = 4;
                break;
            case 301:
                whsType = 5;
                break;
            default:
                throw new CoolException("库位排号分配错误, 源站号：" + sourceStaNo);
@@ -249,9 +252,17 @@
            if (Utils.isShallowLoc(slaveProperties, curRow)) {
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
            }
            if (Cools.isEmpty(locMast)) {
                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
                // 因库位移转、需预留空库位
                if (!locMastService.checkEmptyCount(locMast)) {
                    locMast = null;
                }
            }
        }
        if (Cools.isEmpty(locMast)) {
@@ -293,4 +304,4 @@
        }
    }

}
}