MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -44,19 +44,32 @@

			private Dictionary<string, OrderByType> _taskOrderBy = new()
			{
			{nameof(Dt_Task.Grade), OrderByType.Desc },
			{nameof(Dt_Task.Grade), OrderByType.Asc },
			{nameof(Dt_Task.CreateDate), OrderByType.Asc},
			};


			public Dictionary<string, OrderByType> TaskOrderBy
			{ get { return _taskOrderBy; } set { _taskOrderBy = value; } }


			#region è·åææä»»å¡ç±»åãç¶æ
			public List<int> TaskInboundTypes => typeof(TaskInboundTypeEnum).GetEnumIndexList();

			public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
			public List<int> TaskRelocationboundTypes => typeof(TaskRelocationStatusEnum).GetEnumIndexList();
			public List<int> TaskAGVCarryboundTypes => typeof(TaskAGVCarryStatusEnum).GetEnumIndexList();
			public List<int> TaskAcrossFloorboundTypes => typeof(TaskAcrossFloorStatusEnum).GetEnumIndexList();
			public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();
			public List<int> TaskAGVCarryboundTypes => typeof(TaskAGVCarryTypeEnum).GetEnumIndexList();
			public List<int> TaskAcrossFloorboundTypes => typeof(TaskAcrossFloorTypeEnum).GetEnumIndexList();

			public List<int> TaskInboundStates => typeof(TaskInStatusEnum).GetEnumIndexList();

			public List<int> TaskOutboundStates => typeof(TaskOutStatusEnum).GetEnumIndexList();
			public List<int> TaskRelocationboundStates => typeof(TaskRelocationStatusEnum).GetEnumIndexList();
			public List<int> TaskAGVCarryboundStates => typeof(TaskAGVCarryStatusEnum).GetEnumIndexList();
			public List<int> TaskAcrossFloorboundStates => typeof(TaskAcrossFloorStatusEnum).GetEnumIndexList();

			#endregion è·åææä»»å¡ç±»åãç¶æ


			public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, IRouterRepository routerRepository, ITask_HtyRepository htyRepository) : base(BaseDal)
			{
			@@ -96,81 +109,183 @@
			Dt_Task task = _mapper.Map<Dt_Task>(item);
			// è®¾ç½®ä»»å¡çåå»ºèä¸º"WMS"
			task.Creater = "WMS";
			task.Remark = item.Remark;
			// å¤æä»»å¡ç±»åæ¯å¦ä¸ºåºåºä»»å¡
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			task.TaskState = (int)TaskOutStatusEnum.OutNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = station.stationChildCode;

			task.Floor = "1F";

			task.AGVSign = "";
			}
			// å¤æä»»å¡ç±»åæ¯å¦ä¸ºå¥åºä»»å¡
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			task.TaskState = (int)TaskInStatusEnum.InNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = station.stationChildCode;

			task.Floor = "1F";

			task.AGVSign= "";
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = "1F";

			task.AGVSign = "";
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			if (station != null)
			if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;
			task.TaskState = (int)TaskOutStatusEnum.OutNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = next.stationChildCode;
			task.NextAddress = station.stationChildCode;

			task.Floor = "1F";

			task.AGVSign = "";
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			if (station != null)
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = next.stationChildCode;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.TargetAddress);

			task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			// å¤æä»»å¡ç±»åæ¯å¦ä¸ºå¥åºä»»å¡
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
			{
			if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");

			task.TaskState = (int)TaskInStatusEnum.InNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = station.stationChildCode;

			task.Floor = "1F";

			task.AGVSign = "";
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			if (station != null)
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = next.stationChildCode;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}

			}
			// å¤æä»»å¡ç±»åæ¯å¦ä¸ºç§»åºä»»å¡
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			{
			if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.RelocationGroup)
			{
			task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = "1F";

			task.AGVSign = "";
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			if (station != null)
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = next.stationChildCode;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			task.TaskState = (int)TaskAGVCarryStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = task.TargetAddress;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			//å¤æä»»å¡ç±»åæ¯å¦ä¸ºè·¨æ¥¼å±æ¬è¿ä»»å¡
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
			{
			if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == item.SourceAddress);

			if (station != null)
			{
			var next = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == station.stationFloor);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.CarryNew;

			task.CurrentAddress = item.SourceAddress;

			task.NextAddress = next.stationChildCode;

			task.Floor = station.stationFloor;

			task.AGVSign = "";
			}
			}
			}

			// å°è½¬æ¢åçä»»å¡æ·»å å°ä»»å¡åè¡¨ä¸
			tasks.Add(task);
			}
			@@ -341,7 +456,7 @@
			/// <returns></returns>
			public WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();
			WebResponseContent? content = new WebResponseContent();
			try
			{
			int oldState = task.TaskState;
			@@ -353,6 +468,8 @@

			if (task.TaskState == (int)TaskOutStatusEnum.AGV_OutFinish)
			{
			CompletedTask(task.TaskNum);

			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";

			@@ -374,56 +491,51 @@
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
			task.TaskState = nextStatus;

			//if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
			//{
			// #region å¥åºè°ç¨æ¥å£è·åè´§ä½å°å
			if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
			{
			#region å¥åºè°ç¨æ¥å£è·åè´§ä½å°å

			// // TODO: è°ç¨æ¥å£è·åè´§ä½å°å
			// // åå»ºè¯·æ±å¯¹è±¡
			// var taskDto = new RequestTaskDto()
			// {
			// Position = task.NextAddress,
			// PalletCode = task.PalletCode,
			// };
			//var taskDto = new RequestTaskDto()
			//{
			// Position = task.NextAddress,
			// PalletCode = task.PalletCode,
			//};

			// // è·åWMSipå°å
			// var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			// var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
			// var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.RequestLocation).FirstOrDefault()?.ConfigValue;
			// if (wmsBasez == null \|\| requestLocation == null)
			// {
			// throw new InvalidOperationException("WMS IP æªéç½®");
			// }
			// var wmsIpAddrss = wmsBasez + requestLocation;
			//// è·åWMSipå°å
			//var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			//var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
			//var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.RequestLocation).FirstOrDefault()?.ConfigValue;
			//if (wmsBasez == null \|\| requestLocation == null)
			//{
			// throw new InvalidOperationException("WMS IP æªéç½®");
			//}
			//var wmsIpAddrss = wmsBasez + requestLocation;

			// // åéè¯·æ±å¹¶çå¾ååº
			// var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;
			// if (abc == null)
			// return content.Error();
			// // ååºååååºåå®¹
			// content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
			//// åéè¯·æ±å¹¶çå¾ååº
			//var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;
			//if (abc == null)
			// return content.Error();
			//// ååºååååºåå®¹
			//content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

			//LogFactory.WriteError($"Info_è·åè´§ä½", $"è·åè´§ä½,ä»»å¡å·:ã{task.TaskNum}ã,æçå·ï¼ã{task.PalletCode}ãè¿ååæ°ã{JsonConvert.SerializeObject(content)}ã{Environment.NewLine}{Environment.NewLine}");

			// QuartzLogger.WriteLogToFile($"Info_è·åè´§ä½", $"è·åè´§ä½,ä»»å¡å·:ã{task.TaskNum}ã,æçå·ï¼ã{task.PalletCode}ãè¿ååæ°ã{JsonConvert.SerializeObject(content)}ã{Environment.NewLine}{Environment.NewLine}");
			//// æ£æ¥ç¶æå¹¶è¿å
			//if (!content.Status)
			//{
			// return content;
			//}

			//// ååºååä»»å¡æ°æ®
			//var taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

			// // æ£æ¥ç¶æå¹¶è¿å
			// if (!content.Status)
			// {
			// return content;
			// }
			task.CurrentAddress = task.NextAddress;
			task.NextAddress = task.TargetAddress;
			task.TargetAddress = task.NextAddress;

			// // ååºååä»»å¡æ°æ®
			// var taskResult = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

			// task.CurrentAddress = task.NextAddress;
			// task.NextAddress = taskResult.TargetAddress;
			// task.TargetAddress = task.NextAddress;

			// #endregion å¥åºè°ç¨æ¥å£è·åè´§ä½å°å
			//}
			//else
			if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
			#endregion å¥åºè°ç¨æ¥å£è·åè´§ä½å°å
			}
			else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
			{
			if (App.User.UserId > 0)
			{
			@@ -440,7 +552,8 @@
			BaseDal.DeleteData(task);
			_taskHtyRepository.AddData(task_Hty);
			}
			}else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
			{
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAGVCarryStatusEnum>();

			@@ -448,6 +561,114 @@

			if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
			{
			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";

			Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
			task_Hty.TaskId = 0;

			BaseDal.DeleteData(task);
			_taskHtyRepository.AddData(task_Hty);
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
			{
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAcrossFloorStatusEnum>();

			task.TaskState = nextStatus;

			if (task.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarryFinish)
			{
			CompletedTask(task.TaskNum);

			task.TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarryFinish;
			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";

			Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
			task_Hty.TaskId = 0;

			BaseDal.DeleteData(task);
			_taskHtyRepository.AddData(task_Hty);
			}

			if (task.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarryFinish)
			{
			Dt_StationManager stationManager = new Dt_StationManager();
			string TaskTemplate = string.Empty;
			if (task.Floor == "1F")
			{
			stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "2F");
			TaskTemplate = "BBB";
			}
			else
			{
			stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
			TaskTemplate = "CCC";
			}

			var taskDto = new RequestAcrossFloorTaskDto()
			{
			NextAddress = task.NextAddress,
			PalletCode = task.PalletCode,
			TaskNum = task.TaskNum
			};

			// è·åWMSipå°å
			var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
			var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.AcrossFloorTask).FirstOrDefault()?.ConfigValue;
			if (wmsBasez == null \|\| requestLocation == null)
			{
			throw new InvalidOperationException("WMS IP æªéç½®");
			}
			var wmsIpAddrss = wmsBasez + requestLocation;

			var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;
			if (abc == null)
			return content.Error();
			content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

			if (!content.Status)
			{
			return content;
			}

			// ååºååä»»å¡æ°æ®
			var taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

			Dt_Task taskNew = _mapper.Map<Dt_Task>(taskDTO);
			task.Creater = "WMS";

			taskNew.CurrentAddress = stationManager.stationChildCode;

			taskNew.NextAddress = task.TargetAddress;

			taskNew.Floor = stationManager.stationFloor;

			taskNew.AGVSign = "";

			task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";

			Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
			task_Hty.TaskId = 0;

			BaseDal.DeleteData(task);
			_taskHtyRepository.AddData(task_Hty);

			BaseDal.AddData(taskNew);

			SendAgvTask(TaskTemplate, taskNew.TaskNum);
			return content.OK();
			}

			if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
			{

			CompletedTask(task.TaskNum);

			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";

			@@ -479,7 +700,7 @@
			// è·åWMSipå°å
			var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
			var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;
			var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTaskStatus)?.ConfigValue;
			if (wmsBase == null \|\| updateTask == null)
			{
			throw new InvalidOperationException("WMS IP æªéç½®");
			@@ -500,6 +721,29 @@
			return content;
			}

			public void CompletedTask(int taskNum)
			{
			#region WMSåæ¥ä»»å¡å®æ

			var keys = new Dictionary<string, object>()
			{
			{"taskNum", taskNum}
			};
			// è·åWMSipå°å
			var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
			var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
			if (wmsBase == null \|\| completeTask == null)
			{
			throw new InvalidOperationException("WMS IP æªéç½®");
			}
			var wmsIpAddress = wmsBase + completeTask;

			var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;

			#endregion WMSåæ¥ä»»å¡å®æ
			}

			/// <summary>
			/// ä»»å¡å®æ
			/// </summary>
			@@ -513,29 +757,9 @@
			var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task == null) return WebResponseContent.Instance.Error($"æªæ¾å°è¯¥ä»»å¡ä¿¡æ¯,ä»»å¡å·:ã{taskNum}ã");

			#region WMSåæ¥ä»»å¡å®æ

			//var keys = new Dictionary<string, object>()
			//{
			// {"taskNum", taskNum}
			//};
			//// è·åWMSipå°å
			//var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			//var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
			//var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
			//if (wmsBase == null \|\| completeTask == null)
			//{
			// throw new InvalidOperationException("WMS IP æªéç½®");
			//}
			//var wmsIpAddress = wmsBase + completeTask;

			//var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;

			#endregion WMSåæ¥ä»»å¡å®æ

			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
			{
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
			task.TaskState = nextStatus;

			@@ -549,7 +773,8 @@
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
			{
			//todo åæ¥å°WMS
			CompletedTask(task.TaskNum);

			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
			task.TaskState = nextStatus;
			task.ModifyDate = DateTime.Now;
			@@ -562,8 +787,10 @@
			_taskHtyRepository.AddData(task_Hty);
			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"å åæºå¥åºå®æ");
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup && task.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationExecuting)
			{
			CompletedTask(task.TaskNum);

			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskRelocationStatusEnum>();
			task.TaskState = nextStatus;
			task.ModifyDate = DateTime.Now;