#商品变物料

luxiaotao1123

2020-07-31 23a0da92c1d2e3d046fd6bac53915d5adcf897ac

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

@@ -85,9 +85,10 @@
     * @param whsType 类型 1:双深式货架
     * @param staDescId 路径ID
     * @param sourceStaNo 源站
     * @param matNos 物料号集合
     * @return locNo 检索到的库位号
     */
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
        StartupDto startupDto = new StartupDto();
        RowLastno rowLastno = rowLastnoService.selectById(whsType);
        if (Cools.isEmpty(rowLastno)) {
@@ -105,29 +106,31 @@
            LocMast locMast = null;

            // 同一天同规格货物靠近摆法规则
            List<String> locNos = locDetlService.getSameDetlToday("X004073XX");
            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 (!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;
                    }
                }
            }

@@ -146,7 +149,6 @@
                    }
                }
            }


            basCrnpService.checkSiteStatus(crnNo);
            // 获取目标站