HuaYiZhongHeng/BaiBuSanlou.git

			@@ -38,6 +38,7 @@
			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;
			@@ -97,10 +98,10 @@
			method.Invoke(this, new object[] { conveyorLine, command, station });
			}
			}
			if (station.stationType == 6 && station.stationArea == "3")
			{
			await GetEmptyTrayAsync(station, conveyorLine, command);
			}
			//if (station.stationType == 6 && station.stationArea == "3")
			//{
			// await GetEmptyTrayAsync(station, conveyorLine, command);
			//}

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

			@@ -181,56 +182,23 @@
			public void RequestEmptyOutbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
			{
			if (stationInfo.stationType != 7) return;
			var taskNew = _taskRepository.QueryFirst(x => x.Roadway == stationInfo.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
			if (taskNew == null) //不存在空框出库任务则请求WMS出空库

			var taskNew = _taskRepository.QueryData(x => x.TaskType == (int)TaskOutboundTypeEnum.OutTray);
			//var need = _needBarcodeRepository.QueryFirst(x => x.toArea == stationInfo.stationChildCode && x.productLine == stationInfo.productLine);
			//var cache = command.Reserved5;
			//var proAddress = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == stationInfo.stationChildCode).Where(x => x.DeviceProParamName == ConveyorLineDBName_After.Reserve5.ToString()).FirstOrDefault().DeviceProAddress;
			var cache = Convert.ToInt16(conveyorLine.ReadValue(ConveyorLineDBName_After.Reserve5, stationInfo.stationChildCode));
			ConsoleHelper.WriteColorLine($"已经有{taskNew.Count}个任务,可以放{cache}个空托盘", ConsoleColor.DarkCyan);
			if (taskNew.Count + 1 < cache) //不存在空框出库任务则请求WMS出空库
			{
			ConsoleHelper.WriteWarningLine("请求空托盘");
			//ConsoleHelper.WriteWarningLine("请求空托盘");
			if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status)
			{
			Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
			if (task != null)
			{
			}
			//need.inLineNum += 1;
			//_needBarcodeRepository.UpdateData(need);
			}
			}
			}

			/// <summary>
			/// 输送线请求入库
			/// </summary>
			/// <param name="conveyorLine">输送线实例对象</param>
			/// <param name="command">读取的请求信息</param>
			/// <param name="childDeviceCode">子设备编号</param>
			//public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
			//{
			// var stationInfo = _stationManagerService.GetStationInfoByChildCode(childDeviceCode);
			// if (stationInfo != null)
			// {
			// //_taskService.r
			// }
			// var taskNew = _taskService.QueryCraneConveyorLineTask(command.ConveyorLineTaskNum.ObjToInt(), childDeviceCode);
			// if (taskNew == null)
			// {
			// string barcode = command.ConveyorLineBarcode.TrimEnd();
			// if (_taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode).Result.Status)
			// {
			// Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
			// if (task != null)
			// {
			// ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
			// //taskCommand.InteractiveSignal = command.InteractiveSignal;
			// taskCommand.ResponState = 1;
			// taskCommand.ConveyorLineTaskNum = task.TaskNum;
			// taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
			// conveyorLine.SendCommand(taskCommand, childDeviceCode);

			// //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

			// _taskService.UpdateTaskStatusToNext(task);
			// }
			// }
			// }
			//}

			private async Task GetEmptyTrayAsync(Dt_StationManager stationManager, CommonConveyorLine_After commonConveyor, ConveyorLineTaskCommand_After conveyorLine)
			{