2023.5.31上架区域版本兼容代码。判断当前库位组是否均为同一种物料，如不是，则认定需要执行兼容代码

Junjie

2023-05-31 058770cc7f646ed387757fdde6e45d2f92ea01c4

2023.5.31上架区域版本兼容代码。判断当前库位组是否均为同一种物料，如不是，则认定需要执行兼容代码

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

@@ -196,8 +196,8 @@
            }
        }

        //检测提交的出库库位是否合法(浅库位有非空库位)
        Utils.checkStockOutLocNo(locNos);
//        //检测提交的出库库位是否合法(浅库位有非空库位)
//        Utils.checkStockOutLocNo(locNos);

        // 目标站点状态检测
        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
@@ -380,6 +380,102 @@
                    continue;
                }
            }

            //-----------------2023.5.31上架区域版本兼容代码-----------------------
            //判断当前库位组是否均为同一种物料，如不是，则认定需要执行兼容代码
            //需要将待出库库位前侧库位(不包含最外侧高频库位)执行101全板出库
            String locNo = dto.getLocNo();
            String matnr = null;
            for (LocDetlDto locDetlDto : dto.getLocDetlDtos()) {
                LocDetl locDetl = locDetlDto.getLocDetl();
                if (locDetl.getLocNo().equals(locNo)) {
                    matnr = locDetl.getMatnr();
                }
            }

            List<String> outerLoc = Utils.getGroupOuterSingleLoc(locNo);
            Double wrkPri = 15D;
            for (LocMast locMast : locMastService.selectByLocNos(outerLoc)) {
                if (!locMast.getLocSts().equals("F")) {
                    continue;
                }

                boolean flag = false;
                for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
                    if (!locDetl.getMatnr().equals(matnr)) {
                        flag = true;
                        break;
                    }
                }

                if (flag) {
                    //当前巷道存在不同规格的物料，需要进行101全板出库
                    // 获取路径
                    StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
                    if(staDesc == null){
                        throw new CoolException("出库路径不存在");
                    }

                    // 生成工作号
                    int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(101));
                    // 生成工作档
                    WrkMast wrkMast = new WrkMast();
                    wrkMast.setWrkNo(workNo);
                    wrkMast.setIoTime(now);
                    wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                    wrkMast.setIoType(101); // 入出库状态101全板出库
                    wrkPri += 2D;
                    wrkMast.setIoPri(wrkPri); // 优先级
                    wrkMast.setOutMost(0);
                    wrkMast.setCrnNo(locMast.getCrnNo());
                    wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
                    wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
                    wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                    wrkMast.setFullPlt("Y"); // 满板：Y
                    wrkMast.setPicking("N"); // 拣料
                    wrkMast.setExitMk("N"); // 退出
                    wrkMast.setEmptyMk("N"); // 空板
                    wrkMast.setLinkMis("N");
                    wrkMast.setBarcode(locMast.getBarcode());
                    wrkMast.setAppeUser(userId); // 操作人员数据
                    wrkMast.setAppeTime(now);
                    wrkMast.setModiUser(userId);
                    wrkMast.setModiTime(now);
                    if (!wrkMastService.insert(wrkMast)) {
                        throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
                    }
                    // 生成工作档明细
                    for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
                        WrkDetl wrkDetl = new WrkDetl();
                        wrkDetl.sync(locDetl);
                        wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
                        wrkDetl.setWrkNo(workNo);
                        wrkDetl.setIoTime(now);
                        wrkDetl.setAnfme(locDetl.getAnfme()); // 数量
                        wrkDetl.setAppeTime(now);
                        wrkDetl.setAppeUser(userId);
                        wrkDetl.setModiTime(now);
                        wrkDetl.setModiUser(userId);
                        wrkDetl.setSpecs(locDetl.getSpecs());
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("保存工作档明细失败");
                        }
                    }
                    // 修改库位状态:   F.在库 ====>>> R.出库预约
                    if (locMast.getLocSts().equals("F")) {
                        locMast.setLocSts("R");
                        locMast.setModiUser(userId);
                        locMast.setModiTime(now);
                        if (!locMastService.updateById(locMast)) {
                            throw new CoolException("预约库位状态失败，库位号：" + dto.getLocNo());
                        }
                    } else {
                        throw new CoolException(dto.getLocNo() + "库位不是在库状态");
                    }
                }

            }
            //-----------------2023.5.31上架区域版本兼容代码end-----------------------

            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioWorkType == null) {
@@ -1055,7 +1151,7 @@
            locSts = "O";

            // 库位转移
            if (wrkMast.getIoType() == 11) {
            if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 111) {
                // 库位转移：源库位
                LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                if (Cools.isEmpty(locMast)) {

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -405,8 +405,8 @@
        }
    }

    // 获取当前库位出库前方库位组不包含最外侧库位
    public static List<String> getGroupOutWrkLoc(String locNo){
    // 获取库位前侧全部单品区域库位组(不包含最外侧库位高频区域)
    public static List<String> getGroupOuterSingleLoc(String locNo){
        int row = getRow(locNo);
        switch (row) {
            case 1:
@@ -665,7 +665,7 @@
            if (sign) {
                break;
            }
            List<String> groupInsideLoc = Utils.getGroupOutWrkLoc(locNo);
            List<String> groupInsideLoc = Utils.getGroupOuterSingleLoc(locNo);
            if (!Cools.isEmpty(groupInsideLoc)) {
                for (String insideLoc : groupInsideLoc) {
                    if (locNos.contains(insideLoc)) {