HuaYiZhongHeng/BaiBuLiKu.git

			@@ -4,13 +4,13 @@
			using Quartz;
			using SqlSugar;
			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;
			@@ -22,8 +22,9 @@
			using WIDESEAWCS_QuartzJob.DeviceBase;
			using WIDESEAWCS_QuartzJob.DTO;
			using WIDESEAWCS_QuartzJob.Service;
			using WIDESEAWCS_SignalR;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using static System.Collections.Specialized.BitVector32;
			using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;

			namespace WIDESEAWCS_Tasks
			{
			@@ -39,8 +40,10 @@
			private readonly IMapper _mapper;
			private readonly IDt_StationManagerService _stationManagerService;
			private readonly IDt_StationManagerRepository _stationManagerRepository;
			private readonly ICacheService _cacheService;
			private readonly 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)
			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)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -51,6 +54,8 @@
			_sys_ConfigService = sys_ConfigService;
			_stationManagerService = stationManagerService;
			_stationManagerRepository = stationManagerRepository;
			_cacheService = cacheService;
			_noticeService = noticeService;
			}

			public async Task Execute(IJobExecutionContext context)
			@@ -69,14 +74,22 @@
			List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
			foreach (var station in stationManagers)
			{
			ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
			ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(station.stationChildCode, "DeviceCommand");
			if (command != null && commandWrite != null)
			if (station.stationType == 11)
			{
			var structs = BitConverter.GetBytes(commandWrite.WriteInteractiveSignal).Reverse().ToArray().ToBoolArray();
			if (structs[0] == true)
			ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
			ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(station.stationChildCode, "DeviceCommand");
			if (command != null && commandWrite != null)
			{
			NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
			var structs = BitConverter.GetBytes(commandWrite.WriteInteractiveSignal).Reverse().ToArray().ToBoolArray();
			if (structs[0] == true)
			{
			ConsoleHelper.WriteWarningLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{station.stationChildCode}】空托盘请求扫码入库");
			NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
			}
			else
			{
			ConveyorLineSendFinish(conveyorLine, station.stationChildCode, 0, false);
			}
			}
			}
			}
			@@ -165,10 +178,32 @@
			}
			}
			}

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

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

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

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

			#region 入库

			/// <summary>
			/// 输送线请求入库
			/// </summary>
			@@ -180,7 +215,7 @@
			{
			try
			{
			//ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库");
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库");

			var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
			HandleTaskOut(conveyorLine, command, childDeviceCode, ProtocalDetailValue, task);
			@@ -209,23 +244,26 @@
			Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			if (task != null)
			{
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			if (command.Barcode == task.PalletCode)
			{
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;
			var next = newTask.NextAddress;
			var taskCommand = MapTaskCommand(newTask, command);
			newTask.NextAddress = next;
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			{
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;
			var next = newTask.NextAddress;
			var taskCommand = MapTaskCommand(newTask, command);
			newTask.NextAddress = next;

			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】请求入库下一地址,下一目标地址【{taskCommand.TargetAddress}】");
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】请求入库下一地址,下一目标地址【{taskCommand.TargetAddress}】");

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			}
			}
			}
			}

			#endregion
			#endregion 输送线请求入库下一地址

			/// <summary>
			/// 输送线入库完成
			@@ -239,18 +277,37 @@
			var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
			{
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成,下一目标地址【等待分配货位】");
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			if (command.Barcode == task.PalletCode)
			{
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成,下一目标地址【等待分配货位】");
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

			WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
			if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
			{
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();

			Console.Out.WriteLine(content.Serialize());
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
			task.CurrentAddress = station.stationLocation;
			task.NextAddress = station.stationNGLocation;
			task.TargetAddress = task.NextAddress;
			task.TaskState = nextStatus;
			task.ModifyDate = DateTime.Now;
			task.Modifier = "System";
			_taskRepository.UpdateData(task);
			}
			else
			{
			WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
			Console.Out.WriteLine(content.ToJsonString());
			}
			}
			}
			}

			#endregion
			#endregion 入库

			#region 出库

			/// <summary>
			/// 输送线请求出信息
			/// </summary>
			@@ -263,24 +320,27 @@
			var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
			if (task != null)
			{
			//task.NextAddress = task.NextAddress.Replace("-1", "");
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;

			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);

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

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线请求出库,下一目标地址【{taskCommand.TargetAddress}】");

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(task);
			if (task.TargetAddress == "1020-1")
			if (command.Barcode == task.PalletCode)
			{
			//task.NextAddress = task.NextAddress.Replace("-1", "");
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;

			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);

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

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线请求出库,下一目标地址【{taskCommand.TargetAddress}】");

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(task);
			if (task.TargetAddress == "1020-1")
			{
			_taskService.UpdateTaskStatusToNext(task);
			}
			}
			}
			}
			@@ -296,22 +356,25 @@
			Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			if (task != null)
			{
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			if (command.Barcode == task.PalletCode)
			{
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;
			Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
			if (newTask != null)
			{
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;

			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(newTask, command);
			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(newTask, command);

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

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线请求出库下一地址,下一目标地址【{taskCommand.TargetAddress}】");
			ConsoleHelper.WriteSuccessLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线请求出库下一地址,下一目标地址【{taskCommand.TargetAddress}】");

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			}
			}
			}
			}
			@@ -327,33 +390,36 @@
			var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			if (task != null)
			{
			WebResponseContent content = new WebResponseContent();
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;
			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);

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

			if (task.PalletCode != command.Barcode \|\| task.Remark == "NG")
			if (command.Barcode == task.PalletCode)
			{
			var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
			taskCommand.TargetAddress = NGAddress;
			}
			else
			{
			taskCommand.TargetAddress = 1000;
			}
			WebResponseContent content = new WebResponseContent();
			//ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
			//taskCommand.InteractiveSignal = command.InteractiveSignal;
			//ConveyorLineTaskCommand taskCommand = MapTaskCommand(task, command);

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线出库完成,下一目标地址【{taskCommand.TargetAddress}】");
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			content = _taskService.UpdateTaskStatusToNext(task);
			var next = task.NextAddress;
			var taskCommand = MapTaskCommand(task, command);
			task.NextAddress = next;

			if (task.PalletCode != command.Barcode \|\| task.Remark == "NG")
			{
			var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
			taskCommand.TargetAddress = NGAddress;
			}
			else
			{
			taskCommand.TargetAddress = 1000;
			}

			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线出库完成,下一目标地址【{taskCommand.TargetAddress}】");
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			content = _taskService.UpdateTaskStatusToNext(task);
			}
			}
			}

			#endregion
			#endregion 出库

			/// <summary>
			/// 输送线交互完成
			@@ -372,6 +438,7 @@
			}

			#region 检测空盘实盘任务

			/// <summary>
			/// 监测空托盘实盘出库
			/// </summary>
			@@ -388,7 +455,7 @@
			taskOutboundTypeEnum = TaskOutboundTypeEnum.OutTray;
			else
			taskOutboundTypeEnum = TaskOutboundTypeEnum.Outbound;
			await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker);
			await CheckAndCreateTask(taskOutboundTypeEnum, childDeviceCode, index, platform.Stacker, platform);
			}
			catch (Exception)
			{
			@@ -398,12 +465,13 @@
			/// <summary>
			/// 检查任务并创建新任务
			/// </summary>
			private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, List<string> roadways = null)
			private async Task CheckAndCreateTask(TaskOutboundTypeEnum taskType, string childDeviceCode, int index, string roadWay, Platform platform)
			{
			var tasks = _taskRepository.QueryData(x => x.TaskType == (int)taskType && x.TargetAddress == childDeviceCode);
			if (tasks.Count < index)
			{
			ConsoleHelper.WriteErrorLine($"【{childDeviceCode}】请求【{taskType.ToString()}】任务,已有【{taskType.ToString()}】任务【{tasks.Count}】,最多拥有【{index - 1}】");

			#region 调用WMS获取出库任务

			WMSTaskDTO taskDTO = new WMSTaskDTO();
			@@ -418,8 +486,7 @@
			}
			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(wmsIpAddress, new { position = childDeviceCode, tag = (int)taskType, areaCdoe = roadWay, platform.ProductionLine }.ToJsonString());
			//var result = await HttpHelper.PostAsync("http://localhost:5000/api/Task/RequestTrayOutTaskAsync", dynamic.ToJsonString());

			WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
			@@ -430,7 +497,7 @@

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

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

			CreateAndSendTask(taskDTO);
			}
			@@ -448,8 +515,8 @@
			}
			return content;
			}
			#endregion

			#endregion 检测空盘实盘任务

			#region 化成NG口入库

			@@ -529,7 +596,6 @@
			}
			}


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