lsh#

1

昨天 34b608a146afc012639c355aad795e4da64382e4

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java

@@ -173,10 +173,10 @@
                            if (targSiteArea != null && !targSiteArea.isEmpty()) {
                                for (String areaId : targSiteArea) {
                                    BasStationArea basStationArea = basStationAreaService.getById(Long.parseLong(areaId));
                                    if (basStationArea == null || basStationArea.getStationAlias() == null || basStationArea.getStationAlias().isEmpty()) {
                                    if (basStationArea == null || basStationArea.getStationAliasStaNo() == null || basStationArea.getStationAliasStaNo().isEmpty()) {
                                        continue;
                                    }
                                    siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAlias());
                                    siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAliasStaNo());
//                                    siteList.addAll(basStationArea.getStationAlias());
                                }
                                if (!siteList.isEmpty()) {
@@ -349,8 +349,9 @@
            if (basStation == null){
                return false;
            }
            if (!basStation.getType().equals(0)){
            if (!basStation.getType().equals(0) && !task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)){
                basStation.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
                basStation.setBarcode(task.getBarcode());
                basStationService.updateById(basStation);
            }
        }