HuaYiZhongHeng/BaiBuLiKu.git

			@@ -51,8 +51,7 @@
			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, IDeviceInfoRepository deviceInfoRepository,ITask_HtyRepository task_HtyRepository)
			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;
			@@ -84,7 +83,6 @@
			// 并行处理每个子设备
			var tasks = childDeviceCodes.Select(childDeviceCode => ProcessDeviceAsync(conveyorLine, childDeviceCode)).ToList();
			await Task.WhenAll(tasks);


			// 获取所有站点管理器
			List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
			@@ -156,7 +154,6 @@
			{
			try
			{

			// 读取任务命令和设备命令
			ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
			ConveyorLineTaskCommandWrite commandWrite = conveyorLine.ReadCustomer<ConveyorLineTaskCommandWrite>(childDeviceCode, "DeviceCommand");
			@@ -245,7 +242,6 @@
			}
			catch (Exception ex)
			{

			}
			return Task.CompletedTask;
			}
			@@ -365,7 +361,6 @@
			{
			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)
			@@ -401,7 +396,6 @@
			}
			catch (Exception ex)
			{

			}
			}

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

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

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

			}
			}

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

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

			@@ -585,7 +576,6 @@
			}
			catch (Exception ex)
			{

			}
			}

			@@ -731,7 +721,7 @@
			EquipmentCode = stationManager.stationEquipMOM,
			SessionId = Guid.NewGuid().ToString(),
			EmployeeNo = "MITest",
			SceneType = "2",
			SceneType = "4",
			RequestTime = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now).ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
			};

			@@ -762,34 +752,32 @@
			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.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
			{
			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);
			}
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			}
			}
			else
			@@ -798,6 +786,6 @@
			}
			}

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