Merge branch 'xiaoyang' into dev

wanshenmean

4 天以前 ff006f77f6267fc0d2c4ee810d897a85165f5b8f

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

@@ -107,7 +107,11 @@

            if (task.TaskStatus == (int)TaskOutStatusEnum.Line_OutFinish && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
            {
                return WebResponseContent.Instance.OK();
                //return WebResponseContent.Instance.OK();

                //return _robotTaskService.CheckSourceLineAndCreateRobotTask(task);
                // Todo:获取对向线体是否有托盘号，如果有托盘号直接生成机械手任务

                return GetWMSOutboundTrayTask(task);
            }