HuaYiZhongHeng/BaiBuLiKu.git

			@@ -382,7 +382,6 @@
			_noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
			WriteInfo(conveyorLine.DeviceName, log);

			//Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode);
			if (task != null)
			{
			@@ -429,7 +428,6 @@
			_noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
			WriteInfo(conveyorLine.DeviceName, log);

			//var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode);
			if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
			{
			@@ -461,6 +459,12 @@
			else
			{
			WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
			WriteInfo(conveyorLine.DeviceName, content.ToJsonString());
			if (!content.Status)
			{
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成,任务执行失败{JsonConvert.SerializeObject(content)}");
			return;
			}

			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);

			@@ -562,7 +566,6 @@
			WriteInfo(conveyorLine.DeviceName, log);

			// 查询正在执行的输送线任务，根据任务号和子设备代码获取任务信息
			//Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode);

			// 如果任务存在
			@@ -623,7 +626,6 @@
			WriteInfo(conveyorLine.DeviceName, logs);

			// 查询正在执行的输送线任务
			//var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
			var task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode, command.Barcode);

			// 如果任务存在