HuaYiZhongHeng/BaiBuLiKu.git

			@@ -16,12 +16,14 @@
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_IProcessRepository;
			using WIDESEAWCS_ISystemServices;
			using WIDESEAWCS_ITaskInfo_HtyRepository;
			using WIDESEAWCS_ITaskInfoRepository;
			using WIDESEAWCS_ITaskInfoService;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.DeviceBase;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Repository;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_SignalR;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			@@ -32,8 +34,9 @@
			[DisallowConcurrentExecution]
			public partial class CommonConveyorLineJob : JobBase, IJob
			{
			public readonly ITaskService _taskService;
			private readonly ITaskService _taskService;
			private readonly ITaskRepository _taskRepository;
			private readonly ITask_HtyRepository _task_HtyRepository;
			private readonly ITaskExecuteDetailService _taskExecuteDetailService;
			private readonly IRouterService _routerService;
			private readonly IPlatFormRepository _platFormRepository;
			@@ -43,12 +46,12 @@
			private readonly IDt_StationManagerRepository _stationManagerRepository;
			private readonly ICacheService _cacheService;
			private readonly INoticeService _noticeService;
			private readonly IDeviceInfoRepository _deviceInfoRepository;

			private static List<string>? userTokenIds;
			private static List<int>? userIds;


			public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService)
			public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService, IDeviceInfoRepository deviceInfoRepository, ITask_HtyRepository task_HtyRepository)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -61,13 +64,13 @@
			_stationManagerRepository = stationManagerRepository;
			_cacheService = cacheService;
			_noticeService = noticeService;
			_deviceInfoRepository = deviceInfoRepository;
			_task_HtyRepository = task_HtyRepository;
			}

			public async Task Execute(IJobExecutionContext context)
			{
			string jobName = context.JobDetail.Key.Name;
			//if (MemoryLockManager.TryAcquireLock(jobName))
			//{
			try
			{
			// 从JobDataMap中获取传递的参数
			@@ -76,6 +79,7 @@
			{
			// 查询所有子设备的位置
			List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);

			// 并行处理每个子设备
			var tasks = childDeviceCodes.Select(childDeviceCode => ProcessDeviceAsync(conveyorLine, childDeviceCode)).ToList();
			await Task.WhenAll(tasks);
			@@ -98,7 +102,7 @@
			// 输出警告信息
			ConsoleHelper.WriteWarningLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{station.stationChildCode}】空托盘请求扫码入库");
			// 处理入库请求
			NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
			NGRequestTaskInbound(conveyorLine, command, station, 0);
			}
			else
			{
			@@ -143,15 +147,6 @@
			// 输出异常信息
			Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
			}
			// finally
			// {
			// MemoryLockManager.ReleaseLock(jobName);
			// }
			// }
			// else
			// {
			// ConsoleHelper.WriteErrorLine($"[CommonConveyorLineJob]【{jobName}】任务已被锁定，无法处理");
			// }
			return;
			}

			@@ -159,36 +154,20 @@
			{
			try
			{

			// 读取任务命令和设备命令
			ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
			ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
			if (command != null && commandWrite != null)
			{

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

			// 获取缓存中的用户信息
			if (userTokenIds == null && userIds == null)
			var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
			if (tokenInfos != null && tokenInfos.Any())
			{
			var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
			if (tokenInfos != null && tokenInfos.Any())
			{
			userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
			userIds = tokenInfos.Select(x => x.UserId).ToList();
			userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
			userIds = tokenInfos.Select(x => x.UserId).ToList();

			// 构造通知数据
			object obj = new
			{
			command,
			commandWrite
			};
			// 发送通知
			_noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
			}
			}
			else
			{
			// 构造通知数据
			object obj = new
			{
			@@ -255,12 +234,14 @@
			}
			}
			}

			//if (conveyorLine.DeviceCode == "1001")
			//{
			// ConsoleHelper.WriteSuccessLine("ProcessDeviceAsync方法结束时间：" + DateTime.Now.ToString("G") + $"点位：{childDeviceCode}");
			//}
			}
			}
			catch (Exception ex)
			{

			}
			return Task.CompletedTask;
			}
			@@ -380,14 +361,13 @@
			{
			try
			{

			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成");
			var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
			{
			if (command.Barcode == task.PalletCode && childDeviceCode == task.NextAddress)
			{
			//conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, "1000", childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);

			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成,下一目标地址【等待分配货位,并写入1000】");

			@@ -416,7 +396,6 @@
			}
			catch (Exception ex)
			{

			}
			}

			@@ -435,7 +414,6 @@
			{
			try
			{

			// 查询输送线任务，根据输送线设备和子设备代码获取任务信息
			var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);

			@@ -475,7 +453,6 @@
			}
			catch (Exception ex)
			{

			}
			}

			@@ -537,7 +514,6 @@
			{
			try
			{

			// 打印成功信息，表示托盘已到达指定输送线并完成出库
			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线出库完成");

			@@ -590,7 +566,7 @@
			// 打印成功信息，表示托盘已到达指定输送线并完成出库，下一目标地址已确定
			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线出库完成,下一目标地址【{NGAddress}】");
			// 设置输送线的目标地址为NG地址
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, NGAddress, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, NGAddress, childDeviceCode);
			// 完成输送线发送
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			// 更新任务状态到下一个状态
			@@ -600,7 +576,6 @@
			}
			catch (Exception ex)
			{

			}
			}

			@@ -655,7 +630,7 @@
			else
			taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;
			// 调用检查并创建任务的方法
			await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker, platform);
			await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform);
			}
			catch (Exception)
			{
			@@ -666,7 +641,7 @@
			/// <summary>
			/// 检查任务并创建新任务
			/// </summary>
			private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, Platform platform)
			private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, Platform platform)
			{
			// 查询数据库中已有的任务
			var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode);
			@@ -691,8 +666,11 @@
			}
			var wmsIpAddress = wmsBase + requestTrayOutTask;

			var device = _deviceInfoRepository.QueryData(x => x.DeviceStatus == "1" && x.DeviceRemark == platform.Id.ToString());
			var deviceCode = device.Select(x => x.DeviceCode).ToList();

			// 发送HTTP POST请求获取任务数据
			var result = await HttpHelper.PostAsync(wmsIpAddress, new { position = childDeviceCode, tag = (int)taskType, areaCdoe = roadWay, platform.ProductionLine }.ToJsonString());
			var result = await HttpHelper.PostAsync(wmsIpAddress, new { position = childDeviceCode, tag = (int)taskType, areaCdoe = platform.Stacker, AreaCdoes = deviceCode, platform.ProductionLine }.ToJsonString());
			// 解析返回的JSON数据
			WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);

			@@ -727,7 +705,7 @@

			#region 设备NG口入库

			public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, string TargetAddress)
			public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationManager, int ProtocalDetailValue)
			{
			var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.MOMIP_BASE)?.ConfigValue;
			@@ -736,7 +714,6 @@
			{
			throw new InvalidOperationException("MOM IP 未配置");
			}
			Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
			TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
			{
			Software = "WMS",
			@@ -744,59 +721,71 @@
			EquipmentCode = stationManager.stationEquipMOM,
			SessionId = Guid.NewGuid().ToString(),
			EmployeeNo = "MITest",
			SceneType = "1",
			SceneType = "4",
			RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
			};

			var MOMIpAddress = wmsBase + ipAddress;

			var result = HttpHelper.PostAsync(MOMIpAddress, trayCells.ToJsonString()).Result;
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", $"【{stationManager.stationChildCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", "");
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验返回参数【{result}】");
			WriteInfo("入站校验", $"【{stationManager.stationChildCode}】入站校验返回参数【{result}】");
			ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);

			if (result1.Success)
			{

			var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
			ConsoleHelper.WriteWarningLine("1");
			var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
			if (serialNosError.Count > 0)
			{
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 100, stationManager.stationChildCode);
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			return;
			}

			if (result1.SerialNos.Count <= 0)
			if (stationManager.remark == "ZYNG")
			{
			// 空托盘入库逻辑
			Dt_Task dt_Task = new Dt_Task()
			ConsoleHelper.WriteWarningLine($"【注液NG入库】");
			if (result1.SerialNos.Count <= 0)
			{
			TargetAddress = TargetAddress,
			PalletCode = command.Barcode,
			NextAddress = TargetAddress,
			TaskNum = 0
			};

			var next = dt_Task.NextAddress;
			var taskCommand = MapTaskCommand(dt_Task, command);
			dt_Task.NextAddress = next;

			conveyorLine.SendCommand(taskCommand, childDeviceCode);

			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			ConsoleHelper.WriteWarningLine("1000");
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
			}
			else
			{
			ConsoleHelper.WriteWarningLine("2");
			ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
			}
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			}
			else
			{
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, 1000, childDeviceCode);

			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			if (result1.SerialNos.Count <= 0)
			{
			ConsoleHelper.WriteWarningLine("2");
			ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);
			}
			else
			{
			ConsoleHelper.WriteWarningLine("1000");
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);
			}
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			}
			}
			else
			{

			ConsoleHelper.WriteErrorLine(result1.MOMMessage);
			}
			}

			#endregion 化成NG口入库
			#endregion 设备NG口入库
			}
			}