HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,6 +1,7 @@
			using HslCommunication;
			using Newtonsoft.Json;
			using System.Text.RegularExpressions;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core;
			@@ -100,6 +101,10 @@
			{
			// 使用正则表达式匹配类似 -数字的模式，并替换为空字符串
			task.NextAddress = Regex.Replace(task.NextAddress, @"-(\d+)", "");
			if (Convert.ToInt32(task.NextAddress) > 1999)
			{
			task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
			}
			var comm = _mapper.Map<ConveyorLineTaskCommand>(task);
			comm.InteractiveSignal = command.InteractiveSignal;
			return comm;
			@@ -216,16 +221,28 @@
			var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
			if (task != null)
			{
			//var taskCommand = MapTaskCommand(task, command);
			var next = task.NextAddress;
			var taskCommand = MapTaskCommand(task, command);
			task.NextAddress = next;
			if (task.NextAddress.Contains("JZ"))
			{
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
			task.TaskState = nextStatus;

			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】请求扫码入库(是胖),下一目标地址【{taskCommand.TargetAddress}】");
			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{task.TaskNum}】,托盘条码：【{task.PalletCode}】已到达【{childDeviceCode}】请求扫码入库(实盘),下一目标地址【{task.TargetAddress}】");
			_taskService.UpdateTaskStatusToNext(task);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			}
			else
			{
			//var taskCommand = MapTaskCommand(task, command);
			var next = task.NextAddress;
			var taskCommand = MapTaskCommand(task, command);
			task.NextAddress = next;

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

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(task);
			}
			}
			}
			else