SuZhouGuanHong/ShanMeiXinNengYuan.git

			@@ -1,4 +1,5 @@
			using MapsterMapper;
			using Masuit.Tools;
			using Microsoft.Extensions.Configuration;
			using Microsoft.Extensions.Logging;
			using Newtonsoft.Json;
			@@ -40,6 +41,12 @@
			/// 任务服务
			/// </summary>
			private readonly ITaskService _taskService;


			/// <summary>
			/// 机器人任务服务
			/// </summary>
			private readonly IRobotTaskService _robotTaskService;

			/// <summary>
			/// 任务执行明细服务
			@@ -93,7 +100,7 @@
			/// <param name="mapper">对象映射器</param>
			/// <param name="httpClientHelper">HTTP 客户端帮助类</param>
			/// <param name="logger">日志记录器</param>
			public CommonConveyorLineNewJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, HttpClientHelper httpClientHelper, ILogger<CommonConveyorLineNewJob> logger)
			public CommonConveyorLineNewJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, HttpClientHelper httpClientHelper, ILogger<CommonConveyorLineNewJob> logger, IRobotTaskService robotTaskService)
			{
			_taskService = taskService;
			_taskExecuteDetailService = taskExecuteDetailService;
			@@ -101,6 +108,7 @@
			_mapper = mapper;
			_httpClientHelper = httpClientHelper;
			_logger = logger;
			_robotTaskService = robotTaskService;

			// 初始化调度处理器
			_conveyorLineDispatch = new ConveyorLineDispatchHandler(_taskService, _taskExecuteDetailService, _routerService, _mapper, _logger);
			@@ -247,6 +255,36 @@
			ProcessTaskState(conveyorLine, command, task, childDeviceCode);
			return Task.CompletedTask;
			}
			else if (command.TaskNo == 1 && !command.Barcode.IsNullOrEmpty() && childDeviceCode == "11068")
			{
			if (_robotTaskService.Db.Queryable<Dt_RobotTask>().Any(x => x.RobotTargetAddressPalletCode == command.Barcode))
			{
			return Task.CompletedTask;
			}

			Random rnd = new Random();
			int num = rnd.StrictNext();//产生真随机数
			// 没有任务号但有条码并且在11068位置，直接添加机械手组盘任务
			Dt_RobotTask robotTask = new Dt_RobotTask
			{
			RobotTargetAddressPalletCode = command.Barcode,
			RobotSourceAddress = "1",
			RobotTargetAddress = "2", // 机械手目标地址
			RobotTaskType = (int)RobotTaskTypeEnum.GroupPallet, // 组盘任务
			RobotTaskState = (int)TaskRobotStatusEnum.RobotNew, // 待执行
			RobotTaskTotalNum = 48,
			RobotGrade = 1,
			RobotRoadway = "注液组盘机械手",
			RobotTargetAddressLineCode = childDeviceCode,
			RobotTaskNum = num, // 生成任务号
			RobotDispatchertime = DateTime.Now,

			};
			if (_robotTaskService.AddData(robotTask).Status)
			{
			conveyorLine.SetValue(ConveyorLineDBNameNew.WCS_ACK, (short)1, childDeviceCode);
			}
			}
			}
			}
			catch (Exception innerEx)