Merge branch 'dev' into xiaoyang

wanshenmean

9 分钟以前 14c2d309afcc77c8f0873977d46a5c7af2e67c7f

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService/TaskService.Query.cs

@@ -34,6 +34,21 @@
    }

    /// <summary>
    /// 查询是否有正在执行的去往指定 TargetAddress 的输送线任务
    /// </summary>
    /// <param name="roadway">巷道号</param>
    /// <param name="targetAddress">目标地址</param>
    /// <returns>存在返回 true</returns>
    public bool HasExecutingTaskToTarget(string roadway, string targetAddress)
    {
        return BaseDal.QueryFirst(x =>
            x.Roadway == roadway &&
            x.TargetAddress == targetAddress &&
            x.TaskStatus == (int)TaskOutStatusEnum.Line_OutExecuting,
            TaskOrderBy) != null;
    }

    /// <summary>
    /// 根据任务号、当前地址查询输送线完成的任务
    /// </summary>
    /// <param name="taskNum">任务号</param>
@@ -149,7 +164,7 @@
    public Dt_Task QueryManualInboundTask(string sourceAddress)
    {
        return BaseDal.QueryFirst(x =>
            x.TaskType == (int)TaskInboundTypeEnum.Inbound &&
            (x.TaskType == (int)TaskInboundTypeEnum.Inbound || x.TaskType == (int)TaskInboundTypeEnum.InEmpty) &&
            x.TaskStatus == (int)TaskInStatusEnum.InNew &&
            x.SourceAddress == sourceAddress);
    }