#入库逻辑变更

Junjie

4 天以前 193c3204f7f998df4d603df202dbea88a3074585

 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");
        }
@@ -466,6 +466,15 @@
        OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
        int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo(),locMast.getRow1());
        Integer crnStn = staDesc.getCrnStn();
        if (locMast.getCrnNo() == 1) {
            if (locMast.getRow1() <= 3) {
                crnStn = 1013;
            }else {
                crnStn = 1016;
            }
        }

        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
@@ -476,7 +485,7 @@
        wrkMast.setIoType(ioType); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(locMast.getCrnNo());
        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
        wrkMast.setSourceStaNo(crnStn); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceLocNo(taskDto.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
@@ -580,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();
        // 生成工作档
@@ -665,6 +674,14 @@
            if (Cools.isEmpty(sourceStaNo)) {
                throw new CoolException("检索源站失败");
            }
            if (locMast.getCrnNo() == 1) {
                if (locMast.getRow1() <= 3) {
                    sourceStaNo = 1013;
                }else {
                    sourceStaNo = 1016;
                }
            }

            Date now = new Date();
            // 保存工作档
            WrkMast wrkMast = new WrkMast();
@@ -727,6 +744,14 @@
            if (Cools.isEmpty(sourceStaNo)) {
                throw new CoolException("检索源站失败");
            }
            if (locMast.getCrnNo() == 1) {
                if (locMast.getRow1() <= 3) {
                    sourceStaNo = 1013;
                }else {
                    sourceStaNo = 1016;
                }
            }

            Date now = new Date();
            // 保存工作档