#库位移转逻辑控制

Junjie

2 天以前 c93b77e0d82118624df73573a9eabbd98fb55979

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

@@ -119,7 +119,7 @@
//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
//        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(param.getList().get(0));
        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
        if (Cools.isEmpty(dto)) {
            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");
        }
@@ -589,7 +589,7 @@
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();

        StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto);
        StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto, null);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -832,10 +832,36 @@
        if (Cools.isEmpty(sourceLoc)) {
            throw new CoolException("未找到库位");
        }

        if (Utils.isDeepLoc(slaveProperties, sourceLocNo)) {
            String shallowLoc = Utils.getShallowLoc(slaveProperties, sourceLocNo);
            LocMast locMast = locMastService.selectById(shallowLoc);
            if (locMast == null) {
                throw new CoolException(shallowLoc + "浅库位不存在");
            }

            if(!locMast.getLocSts().equals("O")) {
                throw new CoolException(shallowLoc + "浅库位状态不为空");
            }
        }

        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)) {
            throw new CoolException("未找到库位");
        }

        if (Utils.isDeepLoc(slaveProperties, locNo)) {
            String shallowLoc = Utils.getShallowLoc(slaveProperties, locNo);
            LocMast locMast = locMastService.selectById(shallowLoc);
            if (locMast == null) {
                throw new CoolException(shallowLoc + "浅库位不存在");
            }

            if(!locMast.getLocSts().equals("O")) {
                throw new CoolException(shallowLoc + "浅库位有货，无法移转");
            }
        }

        // 判断库位是否冻结
        String sourceLocFrozen = locMastMapper.findFirstFrozenLocNo(Arrays.asList(sourceLoc.getLocNo(), loc.getLocNo()));
        if (sourceLocFrozen != null) {
@@ -878,6 +904,7 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setMemo("人工手动移库");
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");