站点优化

cl

10 天以前 fc634e5b62b85396196e2dd8f51bfe5ba7337522

站点优化

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java

@@ -94,6 +94,8 @@
    @Autowired
    private LocService locService;
    @Autowired
    private BasStationService basStationService;
    @Autowired
    private WaveOrderRelaServiceImpl waveOrderRelaService;
    @Autowired
    private TaskItemService taskItemService;
@@ -878,7 +880,14 @@
                TaskType.TASK_TYPE_PICK_AGAIN_OUT.type);
        // 先查全部再按 site 去重，避免 GROUP BY 与 only_full_group_by 冲突
        List<DeviceSite> all = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, list));
        Set<String> outAbleSites = basStationService.list(new LambdaQueryWrapper<BasStation>()
                        .eq(BasStation::getOutAble, 1))
                .stream()
                .map(BasStation::getStationName)
                .filter(StringUtils::isNotBlank)
                .collect(Collectors.toSet());
        List<DeviceSite> sites = all.stream()
                .filter(d -> outAbleSites.contains(d.getSite()))
                .collect(Collectors.toMap(DeviceSite::getSite, d -> d, (a, b) -> a))
                .values().stream()
                .collect(Collectors.toList());

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -2090,6 +2090,15 @@
                    log.error("站点不存在！！任务编码：{}，目标站点：{}", task.getTaskCode(), task.getTargSite());
                    continue;
                }
                // 出库下发前校验站点状态与出库能力
                if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
                    if (!Integer.valueOf(1).equals(station.getStatus()) || !Integer.valueOf(1).equals(station.getOutAble())) {
                        log.error("========== RCS任务下发失败 ==========");
                        log.error("站点不可出库下发！！任务编码：{}，目标站点：{}，站点状态(status)：{}，能出(outAble)：{}",
                                task.getTaskCode(), task.getTargSite(), station.getStatus(), station.getOutAble());
                        continue;
                    }
                }
            }

            /**判断是否光电站点，非光店站点需管控站点状态*/

 rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java

@@ -156,8 +156,6 @@
        DeviceSiteService deviceSiteService = SpringUtils.getBean(DeviceSiteService.class);

        List<OrderOutItemDto> list = new ArrayList<>();
        //不让站点重复使用问题
        List<BasStation> stations = new ArrayList<>();
        List<ExistDto> existDtos = new ArrayList<>();
        Set<Loc> locs = new HashSet<>();
        for (WaveToLocParams item : params) {
@@ -207,27 +205,24 @@
                                    maps.add(staListDto);
                                }
                                orderOutItemDto.setStaNos(maps);
                                //获取满足条件站点
                                // 按可出规则选择站点
                                Set<String> stationSet = deviceSites.stream().map(DeviceSite::getSite).collect(Collectors.toSet());
                                String sType = "H";
                                //获取高低站点类型
                                if (startsWithTwoChars(loc.getBarcode(), "31")) {
                                    sType = "L";
                                }
                                //已使用站点
                                Set<String> stas = stations.stream().map(BasStation::getStationName).collect(Collectors.toSet());
                                BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
                                BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                                        .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                                List<BasStation> candidateStations = basStationService.list(new LambdaQueryWrapper<BasStation>()
                                        .in(BasStation::getStationName, stationSet)
//                                        .eq(BasStation::getSType, sType)
                                        .notIn(!stas.isEmpty(), BasStation::getStationName, stas)
                                        .last("LIMIT 1"));
                                stations.add(basStation);

                                if (Objects.isNull(basStation)) {
                                    throw new CoolException("站點不存在！！");
                                        .eq(BasStation::getStatus, 1)
                                        .eq(BasStation::getOutAble, 1));
                                if (candidateStations.isEmpty()) {
                                    throw new CoolException("无可出站点，请检查站点状态或能出配置！！");
                                }
                                candidateStations.sort((a, b) -> {
                                    boolean a1001 = "1001".equals(a.getStationName());
                                    boolean b1001 = "1001".equals(b.getStationName());
                                    if (a1001 && !b1001) return -1;
                                    if (!a1001 && b1001) return 1;
                                    return 0;
                                });
                                BasStation basStation = candidateStations.get(0);
                                orderOutItemDto.setSitesNo(basStation.getStationName());
                            }
                        }