HuaYiZhongHeng/BaiBuSanLouNew.git

			@@ -7,6 +7,7 @@
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_Core.LogHelper;
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob.Models;
			@@ -430,6 +431,15 @@
			}
			}
			}
			else if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut&& taskDTO.RoadWay.Contains("CW"))
			{
			var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationPLC == "1006" && x.stationType == 10 && x.Roadway == taskDTO.RoadWay);
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			task.CurrentAddress = taskDTO.SourceAddress;
			task.NextAddress = stationinfo.stationChildCode;
			task.SourceAddress = taskDTO.SourceAddress;
			task.TargetAddress = taskDTO.TargetAddress;
			}
			else
			{
			var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.TargetAddress && x.Roadway == taskDTO.RoadWay);
			@@ -438,10 +448,6 @@
			task.NextAddress = stationinfo.stationChildCode;
			task.SourceAddress = taskDTO.SourceAddress;
			task.TargetAddress = taskDTO.TargetAddress;
			//if (taskDTO.TaskType == (int)TaskOutboundTypeEnum.InToOut)
			//{
			// task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
			//}
			}
			}
			else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
			@@ -656,12 +662,10 @@
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
			QuartzLogger.WriteLogToFile($"Info_分容任务完成", $"任务完成异常,任务号:【{taskNum}】异常信息【{ex.StackTrace}】{Environment.NewLine}{Environment.NewLine}");
			}
			QuartzLogger.WriteLogToFile($"Info_分容任务完成", $"任务完成,任务号:【{taskNum}】返回参数【{JsonConvert.SerializeObject(content)}】{Environment.NewLine}{Environment.NewLine}");
			return content;
			}
			//public override WebResponseContent DeleteData(Dt_Task entity)
			//{
			// return base.DeleteData(entity);
			//}
			}
			}