库位地图，出库选择，出库拦截非空库位

Junjie

2023-05-26 5d156a85fcb29d64009df1be11ffd0fc86c13b2c

 src/main/java/com/zy/common/web/WcsController.java

@@ -91,7 +91,7 @@
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 103:// 拣料入库
                break;
            case 104:// 并板入库
            case 107:// 盘点入库
                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
                break;
@@ -112,7 +112,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matNos, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -138,12 +138,19 @@
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        if(waitPakins.size()>0) {
            WaitPakin one = waitPakins.get(0);
            wrkMast.setFrozen(one.getFrozen());
            wrkMast.setMemo(one.getMemo());
        }
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            waitPakin.setBatch("");
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -188,7 +195,7 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, locTypeDto);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
@@ -251,8 +258,7 @@
        }
        // 检索库位
        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, ioType, devpNo, matnrList, locTypeDto,0);
        return dto; // 库位号， 堆垛机
        return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto); // 库位号， 堆垛机，目标站
    }

}