HuaYiZhongHeng/BaiBuLiKu.git

			@@ -94,7 +94,7 @@
			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
			{
			// 判断任务目标地址和路径是否满足特定条件
			if ((task.TargetAddress == "002-021-001" \|\| task.TargetAddress == "001-021-001") && task.Roadway.Contains("JZ"))
			if (((task.TargetAddress == "002-021-001" \|\| task.TargetAddress == "001-021-001") && task.Roadway.Contains("JZ"))\|\| task.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm)
			{
			// 设置任务状态为出库新建
			task.TaskState = (int)TaskOutStatusEnum.OutNew;
			@@ -266,6 +266,17 @@
			/// <param name="deviceNo">设备编号</param>
			/// <param name="currentAddress">当前地址</param>
			/// <returns></returns>
			public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress,string Barcode)
			{
			return BaseDal.QueryFirst(x => ((TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew) \|\| (TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)) && x.CurrentAddress == currentAddress && x.PalletCode == Barcode, TaskOrderBy);
			}

			/// <summary>
			/// 根据设备编号、当前地址查询输送线未执行的任务
			/// </summary>
			/// <param name="deviceNo">设备编号</param>
			/// <param name="currentAddress">当前地址</param>
			/// <returns></returns>
			public Dt_Task QueryNextConveyorLineTask(string deviceNo, string currentAddress)
			{
			return BaseDal.QueryFirst(x => ((TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew) \|\| (TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)) && x.NextAddress == currentAddress, TaskOrderBy);
			@@ -289,6 +300,17 @@
			/// <param name="nextAddress">下一地址</param>
			/// <returns></returns>
			public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
			{
			return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting \|\| x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
			}

			/// <summary>
			/// 根据任务号、下一地址查询输送线执行中的任务
			/// </summary>
			/// <param name="taskNum">任务号</param>
			/// <param name="nextAddress">下一地址</param>
			/// <returns></returns>
			public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress,string Barcode)
			{
			return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting \|\| x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
			}
			@@ -646,7 +668,7 @@

			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";
			BaseDal.UpdateData(task);


			_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"系统自动流程，更新当前位置【{oldCurrentPos} ----> {task.CurrentAddress}】和下一位置【{oldNextPos} ----> {task.NextAddress}】");
			return task;
			@@ -687,18 +709,24 @@
			var wmsIpAddress = wmsBase + completeTask;

			var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;
			content = JsonConvert.DeserializeObject<WebResponseContent>(result);
			if (!content.Data.IsNullOrEmpty())
			{
			if (content.Data.ToString() == "NG")
			{
			task.Remark = "NG";
			//BaseDal.UpdateData(task);
			//_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成，MOM返回NG");
			}
			}
			task.ExceptionMessage += " " + content.Message;

			QuartzLogger.WriteLogToFile($"Info_任务完成", $"任务完成,任务号:【{taskNum}】返回参数【{JsonConvert.SerializeObject(result)}】{Environment.NewLine}{Environment.NewLine}");
			if(result != null)
			{

			content = JsonConvert.DeserializeObject<WebResponseContent>(result);
			if (!content.Data.IsNullOrEmpty())
			{
			if (content.Data.ToString() == "NG")
			{
			task.Remark = "NG";
			//BaseDal.UpdateData(task);
			//_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成，MOM返回NG");
			}
			}
			task.ExceptionMessage += " " + content.Message;

			}
			#endregion WMS同步任务完成

			if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
			@@ -769,7 +797,7 @@
			catch (Exception ex)
			{
			content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
			QuartzLogger.WriteLogToFile($"Info_任务完成", $"任务完成异常,任务号:【{taskNum}】异常信息【{ex.Message}】{Environment.NewLine}{Environment.NewLine}");
			QuartzLogger.WriteLogToFile($"Info_任务完成", $"任务完成异常,任务号:【{taskNum}】异常信息【{ex.StackTrace}】{Environment.NewLine}{Environment.NewLine}");
			}
			QuartzLogger.WriteLogToFile($"Info_任务完成", $"任务完成,任务号:【{taskNum}】返回参数【{JsonConvert.SerializeObject(content)}】{Environment.NewLine}{Environment.NewLine}");
			return content;
			@@ -869,6 +897,10 @@
			{
			return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskStatus.Created);
			}
			public Dt_Task QueryOutFireAlarmTask(string deviceNo)
			{
			return BaseDal.QueryFirst(x => x.Roadway == deviceNo && x.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm && x.TaskState == (int)TaskOutStatusEnum.OutNew);
			}

			public Dt_Task QueryExecutingTaskByBarcode(string barcode, string nextAddress)
			{