2023.06.02兼容代码，后期库位规则符合要求后可删除

Junjie

2023-06-02 f54145a17446da2a93a79d5e53e699729a994ba8

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -160,41 +160,48 @@
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        ArrayList<String> locNos = new ArrayList<>();
        List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
        ArrayList<String> matnrs = new ArrayList<>();//目的做数据去重
        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
            if (!matnrs.contains(locDetl.getMatnr())) {
                matnrs.add(locDetl.getMatnr());

                //1.根据物料号先搜索高频区域是否有库存
                List<StockOutParam.LocDetl> locNoStep1 = this.findLocNoStep1(locDetl);
                if (locNoStep1 != null) {
                    locDetls.addAll(locNoStep1);
                    continue;
                }

                //高频混放区域没有满足的库位，在单品区域进行搜索
                List<StockOutParam.LocDetl> locNoStep2 = this.findLocNoStep2(locDetl);
                if (locNoStep2 != null) {
                    locDetls.addAll(locNoStep2);
                    continue;
                }

                //低频混放区域进行搜索
                List<StockOutParam.LocDetl> locNoStep3 = this.findLocNoStep3(locDetl);
                if (locNoStep3 != null) {
                    locDetls.addAll(locNoStep3);
                    continue;
                }

            }
        }

        for (StockOutParam.LocDetl locDetl : locDetls) {
            if (!locNos.contains(locDetl.getLocNo())) {
        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
            if (!locNos.contains(locDetl.getLocNo())){
                locNos.add(locDetl.getLocNo());
            }
        }
        List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
//        ArrayList<String> locNos = new ArrayList<>();
//        List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
//        ArrayList<String> matnrs = new ArrayList<>();//目的做数据去重
//        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
//            if (!matnrs.contains(locDetl.getMatnr())) {
//                matnrs.add(locDetl.getMatnr());
//
//                //1.根据物料号先搜索高频区域是否有库存
//                List<StockOutParam.LocDetl> locNoStep1 = this.findLocNoStep1(locDetl);
//                if (locNoStep1 != null) {
//                    locDetls.addAll(locNoStep1);
//                    continue;
//                }
//
//                //高频混放区域没有满足的库位，在单品区域进行搜索
//                List<StockOutParam.LocDetl> locNoStep2 = this.findLocNoStep2(locDetl);
//                if (locNoStep2 != null) {
//                    locDetls.addAll(locNoStep2);
//                    continue;
//                }
//
//                //低频混放区域进行搜索
//                List<StockOutParam.LocDetl> locNoStep3 = this.findLocNoStep3(locDetl);
//                if (locNoStep3 != null) {
//                    locDetls.addAll(locNoStep3);
//                    continue;
//                }
//
//            }
//        }
//
//        for (StockOutParam.LocDetl locDetl : locDetls) {
//            if (!locNos.contains(locDetl.getLocNo())) {
//                locNos.add(locDetl.getLocNo());
//            }
//        }

//        //检测提交的出库库位是否合法(浅库位有非空库位)
//        Utils.checkStockOutLocNo(locNos);
@@ -403,9 +410,14 @@
                }
            }

            List<String> outerLoc = Utils.getGroupOuterSingleLoc(locNo);
            List<String> outerLocs = Utils.getGroupOuterSingleLoc(locNo);
            Double wrkPri = 15D;
            for (LocMast locMast : locMastService.selectByLocNos(outerLoc)) {
            for (String outerLoc : outerLocs) {
                LocMast locMast = locMastService.selectById(outerLoc);
                if (locMast == null) {
                    continue;
                }

                if (!locMast.getLocSts().equals("F")) {
                    continue;
                }