Merge branch 'dev' into xiaoyang

wanshenmean

3 天以前 ef57389fd66aca85d6fb4a73c0f7c1c1f7d607b2

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Flows/OutboundTaskFlowService.cs

@@ -99,7 +99,7 @@

            if (task.TaskStatus == (int)TaskOutStatusEnum.Line_OutFinish && task.TaskType == (int)TaskOutboundTypeEnum.OutEmpty)
            {
                _robotTaskService.CreateLocalRobotTask(task);
               return _robotTaskService.CreateLocalRobotTask(task);
                //if (!content.Status)
                //{
                //    return content;