Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs

tqs

2022-10-29 b392ca2326ddefda33845611f9c7499d0fd6fcef

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

@@ -144,7 +144,7 @@
        LocMast locMast = null;

        // 靠近摆放规则 --- 同天同规格物料
        if (!Cools.isEmpty(matNos)) {
        if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
            List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
            for (String locNo : locNos) {
                List<String> groupLoc = Utils.getGroupLoc(locNo);
@@ -284,7 +284,7 @@
                    }
                }
            }
            // 因库位移转、需预留空库位
            // 因库位移转、需预留空库位 todo:luxiaotao
//            if (!locMastService.checkEmptyCount(locMast)) {
//                locMast = null;
//            }