HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,4 +1,5 @@
			#region MyRegion

			#region << 版本注释 >>

			/*----------------------------------------------------------------
			@@ -20,32 +21,24 @@

			using AutoMapper;
			using HslCommunication;
			using Microsoft.AspNetCore.Server.HttpSys;
			using Newtonsoft.Json;
			using Quartz;
			using SqlSugar;
			using System.Diagnostics.CodeAnalysis;
			using System.Net;
			using System.Reflection;
			using System.Threading.Tasks;
			using WIDESEAWCS_BasicInfoRepository;
			using WIDESEAWCS_BasicInfoService;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.Caches;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_Core.HttpContextUser;
			using WIDESEAWCS_DTO.MOM;
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_IProcessRepository;
			using WIDESEAWCS_ISystemRepository;
			using WIDESEAWCS_ISystemServices;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.DeviceBase;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_SignalR;
			@@ -90,6 +83,7 @@
			if (conveyorLine != null)
			{
			#region 站台方式

			//List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);

			//foreach (var station in stationManagers)
			@@ -105,10 +99,12 @@
			// method.Invoke(this, new object[] { conveyorLine, command, station });
			// }
			// }
			//}
			#endregion
			//}

			#endregion 站台方式

			#region 路由方式

			List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
			foreach (string childDeviceCode in childDeviceCodes)
			{
			@@ -163,10 +159,9 @@
			_noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });

			#endregion 调用事件总线通知前端

			}
			#endregion

			#endregion 路由方式
			}
			}
			catch (Exception ex)
			@@ -180,7 +175,6 @@
			}
			return Task.CompletedTask;
			}


			/// <summary>
			/// 输送线请求入库
			@@ -327,30 +321,31 @@
			RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
			};

			var MOMIpAddress = wmsBase + ipAddress;
			var MOMIpAddress = wmsBase + ipAddress;

			var result = HttpHelper.PostAsync(MOMIpAddress, trayCells.ToJsonString()).Result;
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", "");
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验返回参数【{result}】");
			ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
			if (result1.Success \|\| task.Remark != "NG")
			{
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			var result = HttpHelper.PostAsync(MOMIpAddress, trayCells.ToJsonString()).Result;
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", "");
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验返回参数【{result}】");
			ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
			if (result1.Success \|\| task.Remark != "NG")
			{
			ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			{
			ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
			}
			}
			else
			{
			ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
			taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
			_taskService.UpdateTaskStatusToNext(task);
			}
			}
			else
			{
			ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
			taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
			_taskService.UpdateTaskStatusToNext(task);
			}
			}
			}
			@@ -448,7 +443,6 @@
			}
			var wmsIpAddress = wmsBase + requestTrayOutTask;


			var result = await HttpHelper.PostAsync(wmsIpAddress, new { position = childDeviceCode, tag = (int)taskType, areaCdoe = roadWay, roadways = roadways }.ToJsonString());
			//var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString());

			@@ -460,7 +454,7 @@

			taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

			#endregion
			#endregion 调用WMS获取出库任务

			CreateAndSendTask(taskDTO);
			}
			@@ -478,10 +472,7 @@
			}
			return content;
			}




			}
			}

			#endregion