lsh#

1

昨天 34b608a146afc012639c355aad795e4da64382e4

lsh#

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

@@ -349,7 +349,7 @@
            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);

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

@@ -454,14 +454,37 @@
                        || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                        || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                    task.setTaskStatus(TaskStsType.COMPLETE_IN.id);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
                        || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)){
                    if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
                        task.setTaskStatus(TaskStsType.AWAIT.id);
                    } else {
                        task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                    }
                    String targSite = task.getTargSite();
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
                    basStation.setUseStatus("F");
                    basStation.setBarcode(task.getBarcode());
                    basStationService.updateById(basStation);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
                        || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
                        || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
                    if (!Cools.isEmpty(task.getResource()) && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
                    task.setTaskStatus(TaskStsType.AWAIT.id);
                } else if ( task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
                        || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {//备货
                    } else {
                        task.setTaskStatus(TaskStsType.WAVE_SEED.id);
                    }
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)){//备货
                    task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)){
                    task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
                    String targSite = task.getTargSite();
                    BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
                    basStation.setUseStatus("D");
                    basStation.setBarcode(task.getBarcode());
                    basStationService.updateById(basStation);
                } else {
                    log.error(task.getTaskCode()+":任务无法完成");
                    continue;
                }
                taskService.updateById(task);
            }