代码提交

huangxiaoqiang

5 天以前 0e674f770d785bfd24b5034456c2502dcc6671d2

 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -102,7 +102,7 @@
                {
                    tasks.Add(item);
                }
                  BaseDal.AddData(tasks);
                BaseDal.AddData(tasks);
                _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskNum).ToList(), "鎺ユ敹WMS浠诲姟");
                content = WebResponseContent.Instance.OK("鎴愬姛");
            }
@@ -123,9 +123,24 @@
        /// <param name="deviceNo">璁惧缂栧彿</param>
        /// <param name="currentAddress">褰撳墠鍦板潃</param>
        /// <returns></returns>
        public List<string> QueryConveyorLineTaskSourceAddress()
        public List<string> QueryConveyorLineTask()
        {
            return BaseDal.QueryData().Select(task => task.SourceAddress).ToList();
            var query = BaseDal.QueryData();
            return query.SelectMany(x =>
                new[] { x.SourceAddress, x.TargetAddress }
                .Where(address => !string.IsNullOrEmpty(address)))
                .ToList();
        }

        /// <summary>
        /// 鏌ユ壘璇ョ珯鍙版槸鍚︽湁浠诲姟
        /// </summary>
        /// <param name="deviceNo">璁惧缂栧彿</param>
        /// <param name="currentAddress">褰撳墠鍦板潃</param>
        /// <returns></returns>
        public Dt_Task QueryConveyorLineTask(string stationName)
        {
            return BaseDal.QueryFirst(x => x.SourceAddress == stationName||x.TargetAddress==stationName);
        }

        /// <summary>
@@ -205,11 +220,11 @@
        /// <returns></returns>
        public Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null)
        {
            if(taskTypeGroup == null)
            if (taskTypeGroup == null)
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
            if(taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
            if (taskTypeGroup.Value == TaskTypeGroup.InboundGroup)
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy);
            if(taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
            if (taskTypeGroup.Value == TaskTypeGroup.OutbondGroup)
                return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy);
            return null;
        }
@@ -222,7 +237,7 @@
        /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
        public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
        {
            return BaseDal.QueryFirst(x => x.TaskState == (int)TaskOutStatusEnum.OutNew && x.AGVName==deviceNo,TaskOrderBy);
            return BaseDal.QueryFirst(x => x.TaskState == (int)AGVTaskStatusEnum.AGVNew && x.AGVName == deviceNo, TaskOrderBy);
        }