新增工作站出库任务优化

skyouc

3 天以前 d843848e44a3d81ab47241d925cf4644bf111984

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -131,27 +131,6 @@
                if (issued <= 0.0D) {
                    continue;
                }

//                if (!Objects.isNull(orderDetl.getStandby1())) {
//                    BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
//                    if (Objects.isNull(basDevice)) {
//                        throw new CoolException("机台信息不存在！！");
//                    }
//                    List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
//                    if (Objects.isNull(binds) || binds.isEmpty()) {
//                        throw new CoolException("台机未绑定工作站台！！");
//                    }
//                    Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
//
//                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                            .in("loc_no", locs)
//                            .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
//
//
//                } else {
//
//                }

                List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
                for (LocDetl locDetl : locDetls) {
@@ -161,10 +140,32 @@
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        List<Integer> staNos;
                        if (!Objects.isNull(orderDetl.getStandby1())) {
                            BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>().eq("dev_no", orderDetl.getStandby1()));
                            if (Objects.isNull(basDevice)) {
                                throw new CoolException("机台信息不存在！！");
                            }
                            List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
                            if (Objects.isNull(binds) || binds.isEmpty()) {
                                throw new CoolException("台机未绑定工作站台！！");
                            }
                            Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());

                            LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .in("loc_no", locs)
                                    .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
                                    .eq("dev_no", basDevice.getDevNo())
                                    .orderAsc(Arrays.asList("loc_no"))
                                    .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));

                            staNos =  staDescService.queryOutStaNosByLocNo(locMasts.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        } else {
                            staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        }

                        locDto.setStaNos(staNos);
                        locDto.setBrand(orderDetl.getBrand());

                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
                        locDto.setStandby3(orderDetl.getStandby3());
@@ -229,7 +230,7 @@
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) { continue; }
            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto, locDto.getStandby1());
            if (TaskDto.has(taskDtos, taskDto)) {
                TaskDto dto = TaskDto.find(taskDtos, taskDto);
                assert dto != null;
@@ -241,7 +242,9 @@
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {
            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            workService.stockOut(staNo, taskDto, getUserId());
            if (!Objects.isNull(taskDto.getDeviceNo())) {
                workService.stockOut(staNo, taskDto, taskDto.getDeviceNo(), getUserId());
            }
        }
        return R.ok();
    }