#优化

lsh

2024-08-21 4c7036fe617faafaea7b9fd1b3cff5f4a4b09616

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

@@ -94,7 +94,7 @@
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto,0);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -846,7 +846,7 @@
                        }
                        WaitPakin waitPakin = new WaitPakin();
                        waitPakin.sync(mat);
                        waitPakin.setBatch("");
                        //waitPakin.setBatch("");
                        waitPakin.setZpallet(locDetl.getZpallet());   // 托盘码
                        waitPakin.setIoStatus("N");     // 入出状态
                        waitPakin.setAnfme(locDetl.getAnfme());  // 数量
@@ -876,6 +876,12 @@
                //     throw new CoolException("只能存在一笔盘点任务");
                // }
            }
            if (ioType!=101){
                if (basDevp==114 || basDevp==214){
                    throw new CoolException("2楼只允许全板出库，请选择全部物料");
                }
            }

            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -891,13 +897,30 @@
                //    }
                //}
                if (ioType == 101) {
                    if (staNo.getDevNo()==300){
                    if (basDevp==300){
                        if(locMast.getCrnNo() == 1) {
                            staNo.setDevNo(100);
                        } else {
                            staNo.setDevNo(200);
                        }

                    } else if (basDevp == 114){
                        if (!dto.isSign()){
                            staNo.setDevNo(100);
                        } else {
                            staNo.setDevNo(basDevp);
                        }
                    } else if (basDevp == 214){
                        if (!dto.isSign()){
                            staNo.setDevNo(200);
                        } else {
                            staNo.setDevNo(basDevp);
                        }
                    } else {
                        if(locMast.getCrnNo() == 1) {
                            staNo.setDevNo(100);
                        } else {
                            staNo.setDevNo(200);
                        }
                    }
                } else {
                    staNo.setDevNo(basDevp);
@@ -1224,7 +1247,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto,0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();