HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,19 +1,16 @@
			using Newtonsoft.Json;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Text;
			using HslCommunication;
			using Newtonsoft.Json;
			using System.Text.RegularExpressions;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common;
			using WIDESEAWCS_Common.TaskEnum;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.Helper;
			using WIDESEAWCS_DTO.TaskInfo;
			using WIDESEAWCS_DTO.WMS;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using HslCommunication;
			using WIDESEAWCS_DTO.WMS;
			using WIDESEAWCS_Common;

			namespace WIDESEAWCS_Tasks
			{
			@@ -25,8 +22,11 @@
			private void HandleTaskOut(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, Dt_Task taskOut)
			{
			if (taskOut == null) return;
			//ConveyorLineTaskCommand? taskCommand = MapTaskCommand(taskOut, command);

			var next = taskOut.NextAddress;
			var taskCommand = MapTaskCommand(taskOut, command);
			taskOut.NextAddress = next;

			bool isOutTray = taskOut.TaskType == (int)TaskOutboundTypeEnum.OutTray;
			bool isOutboundAndOutFinish = taskOut.TaskType == (int)TaskOutboundTypeEnum.Outbound && taskOut.TaskState == (int)TaskOutStatusEnum.SC_OutFinish;
			@@ -35,6 +35,9 @@
			if (isOutTray \|\| isOutboundAndOutFinish \|\| !isOutboundAndLineOutExecuting)
			{
			conveyorLine.SendCommand(taskCommand, childDeviceCode);

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

			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(taskOut);
			}
			@@ -53,22 +56,26 @@

			switch (stationManager.stationType)
			{
			case 5:
			case 1:
			await RequestWmsTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
			break;

			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			await CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
			break;

			case 7:
			RequestOutNextAddress(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
			break;

			case 10:
			ConveyorLineOutFinish(conveyorLine, command, childDeviceCode, ProtocalDetailValue);
			break;

			default:
			break;
			}
			@@ -92,6 +99,12 @@
			/// </summary>
			private ConveyorLineTaskCommand MapTaskCommand(Dt_Task task, ConveyorLineTaskCommand command)
			{
			// 使用正则表达式匹配类似 -数字的模式，并替换为空字符串
			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;
			@@ -150,7 +163,13 @@
			var task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
			if (task != null)
			{
			//var taskCommand = MapTaskCommand(task, command);
			var next = task.NextAddress;
			var taskCommand = MapTaskCommand(task, command);
			task.NextAddress = next;

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

			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(task);
			@@ -202,14 +221,32 @@
			var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
			if (task != null)
			{
			var taskCommand = MapTaskCommand(task, command);
			conveyorLine.SendCommand(taskCommand, childDeviceCode);
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			_taskService.UpdateTaskStatusToNext(task);
			if (task.NextAddress.Contains("JZ"))
			{
			int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
			task.TaskState = nextStatus;

			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;

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

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