luxiaotao1123
2020-08-28 5d2d9dbe286f6e079232e68d30bbd0530ccecaef
#v2.0
1个文件已修改
56 ■■■■ 已修改文件
src/main/java/com/zy/common/service/CommonService.java 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java
@@ -112,34 +112,34 @@
            // 目标库位
            LocMast locMast = null;
            // 同一天同规格货物靠近摆法规则
            if (!Cools.isEmpty(matNos)) {
                List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
                for (String locNo : locNos) {
                    // 获取排
                    int row = Integer.parseInt(locNo.substring(0, 2));
                    // 判断是否为深库位
                    double remainder = Arith.remainder(row, rowCount / crn_qty);
                    int targetRow;
                    if (remainder == 1) {
                        // 得到当前库位的外围库位
                        targetRow =  row + 1;
                    } else if (remainder == 0) {
                        // 得到当前库位的内围库位
                        targetRow =  row - 1;
                    } else {
                        continue;
                    }
                    String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
                    // 检测目标库位是否为空库位
                    LocMast targetLocMast = locMastService.selectById(targetLocNo);
                    if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) {
                        locMast = targetLocMast;
                        crnNo = locMast.getCrnNo();
                        break;
                    }
                }
            }
            // 同一天同规格货物靠近摆法规则 todo:luxiaotao
//            if (!Cools.isEmpty(matNos)) {
//                List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
//                for (String locNo : locNos) {
//                    // 获取排
//                    int row = Integer.parseInt(locNo.substring(0, 2));
//                    // 判断是否为深库位
//                    double remainder = Arith.remainder(row, rowCount / crn_qty);
//                    int targetRow;
//                    if (remainder == 1) {
//                        // 得到当前库位的外围库位
//                        targetRow =  row + 1;
//                    } else if (remainder == 0) {
//                        // 得到当前库位的内围库位
//                        targetRow =  row - 1;
//                    } else {
//                        continue;
//                    }
//                    String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
//                    // 检测目标库位是否为空库位
//                    LocMast targetLocMast = locMastService.selectById(targetLocNo);
//                    if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) {
//                        locMast = targetLocMast;
//                        crnNo = locMast.getCrnNo();
//                        break;
//                    }
//                }
//            }
            // 如果没有相近物料,则按规则轮询货架
            if (null == locMast) {