Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

昨天 c620f4cbc6f5ed50758ea548855773bfed2dcd39

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

@@ -455,7 +455,10 @@
                        || 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)){
                    if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
                    if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
                            || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
                            || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
                    ){
                        task.setTaskStatus(TaskStsType.AWAIT.id);
                    } else {
                        task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
@@ -467,9 +470,13 @@
                } 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))
                            // 盘点出库先到 196(非波次)
                            ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    if ((!Cools.isEmpty(task.getResource())
                            && (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)
                                || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
                                || task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)
                           )
                        )// 盘点出库先到 196(非波次)
                        ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
                    ) {
                        task.setTaskStatus(TaskStsType.AWAIT.id);
                    } else {