HuaYiZhongHeng/BaiBuLiKu.git

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

			#region << 版本注释 >>

			/*----------------------------------------------------------------
			@@ -20,33 +21,29 @@

			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.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;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;

			namespace WIDESEAWCS_Tasks
			{
			@@ -61,8 +58,10 @@
			private readonly ISys_ConfigService _sys_ConfigService;
			private readonly IMapper _mapper;
			private readonly IDt_StationManagerRepository _stationManagerRepository;
			private readonly ICacheService _cacheService;
			private readonly INoticeService _noticeService;

			public CommonConveyorLine_GWJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository)
			public CommonConveyorLine_GWJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IPlatFormRepository platFormRepository, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ICacheService cacheService, INoticeService noticeService)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -72,6 +71,8 @@
			_platFormRepository = platFormRepository;
			_sys_ConfigService = sys_ConfigService;
			_stationManagerRepository = stationManagerRepository;
			_cacheService = cacheService;
			_noticeService = noticeService;
			}

			public Task Execute(IJobExecutionContext context)
			@@ -82,6 +83,7 @@
			if (conveyorLine != null)
			{
			#region 站台方式

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

			//foreach (var station in stationManagers)
			@@ -97,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)
			{
			@@ -133,38 +137,36 @@
			method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(platform.Location))
			{
			var strings = platform.Location.Split(',').ToList();
			foreach (var ite in strings)
			{
			int index = strings.FindIndex(p => p == ite);
			ConveyorLineTaskCommand command1 = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(ite);
			if (command1.InteractiveSignal != 2)
			{
			MethodInfo? method = GetType().GetMethod(platform.ExecutionMethod);
			if (method != null)
			{
			int count = strings.Count - index;
			method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode, count, platform });
			}
			}
			}
			}
			}
			}
			}

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

			var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
			if (tokenInfos == null \|\| !tokenInfos.Any())
			{
			//throw new Exception(conveyorLine.DeviceName + "缓存中未找到Token缓存");
			continue;
			}
			var userTokenIds = tokenInfos?.Select(x => x.Token_ID).ToList();
			var userIds = tokenInfos?.Select(x => x.UserId).ToList();

			object obj = new
			{
			childDeviceCode,
			commandAfter = command,
			};
			_noticeService.StackerData(userIds?.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, data = obj });

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

			#endregion 路由方式
			}
			}
			catch (Exception ex)
			{
			Console.Out.WriteLine(nameof(CommonConveyorLine_AfterJob) + ":" + ex.ToString());
			Console.Out.WriteLine(nameof(CommonConveyorLine_GWJob) + ":" + ex.ToString());
			}
			finally
			{
			@@ -173,7 +175,6 @@
			}
			return Task.CompletedTask;
			}


			/// <summary>
			/// 输送线请求入库
			@@ -189,7 +190,7 @@
			var task = _taskService.QueryBarCodeConveyorLineTask(command.ConveyorLineBarcode, childDeviceCode);
			//HandleTaskOut(conveyorLine, command, childDeviceCode, task);
			// && command.ConveyorLineBarcode != "NoRead" && !command.ConveyorLineBarcode.IsNotEmptyOrNull()

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】托盘号：【{command.ConveyorLineBarcode}】设备编码：【{childDeviceCode}】");
			if (task == null)
			{
			HandleNewTask(conveyorLine, command, childDeviceCode);
			@@ -219,6 +220,12 @@
			Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
			if (task != null)
			{
			if (command.ConveyorLineBarcode != task.PalletCode)
			{
			conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, childDeviceCode);
			return;
			}

			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			{
			@@ -243,7 +250,7 @@
			/// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>
			public void ConveyorLineInFinish(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
			{
			var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
			var task = _taskService.QueryExecutingTaskByBarcode(command.ConveyorLineBarcode, childDeviceCode);
			if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
			{
			//ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			@@ -306,7 +313,7 @@
			TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
			{
			Software = "WMS",
			TrayBarcode = task.PalletCode,
			TrayBarcode = command.ConveyorLineBarcode,
			EquipmentCode = stationManager.stationEquipMOM,
			SessionId = Guid.NewGuid().ToString(),
			EmployeeNo = "MITest",
			@@ -321,7 +328,7 @@
			WriteInfo("入站校验", "");
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验返回参数【{result}】");
			ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);
			if (result1.Success)
			if (result1.Success \|\| task.Remark != "NG")
			{
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			@@ -339,6 +346,7 @@
			conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
			_taskService.UpdateTaskStatusToNext(task);
			}

			}
			}

			@@ -435,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());

			@@ -447,7 +454,7 @@

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

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

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




			}
			}

			#endregion