HuaYiZhongHeng/BaiBuSanLouNew.git

			@@ -6,6 +6,8 @@
			using Microsoft.VisualBasic;
			using MoYu.Logging;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			using SqlSugar;
			using System.Text.RegularExpressions;
			using System.Threading.Tasks;
			using WIDESEAWCS_Common;
			@@ -17,6 +19,7 @@
			using WIDESEAWCS_DTO.WMS;
			using WIDESEAWCS_Model.Models;
			using WIDESEAWCS_QuartzJob;
			using WIDESEAWCS_QuartzJob.Models;
			using WIDESEAWCS_Tasks.ConveyorLineJob;
			using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;

			@@ -101,10 +104,10 @@
			{
			// 使用正则表达式匹配类似 -数字的模式，并替换为空字符串
			task.NextAddress = Regex.Replace(task.NextAddress, @"-(\d+)", "");
			if (Convert.ToInt32(task.NextAddress) > 1999)
			{
			task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
			}
			//if (Convert.ToInt32(task.NextAddress) > 2999)
			//{
			// task.NextAddress = (Convert.ToInt32(task.NextAddress) - 1000).ToString();
			//}
			var comm = _mapper.Map<ConveyorLineTaskCommand>(task);
			comm.InteractiveSignal = command.InteractiveSignal;
			return comm;
			@@ -573,11 +576,9 @@
			else if (task.Roadway.Contains("JZ"))
			{
			// 查询是否存在静置出库任务
			var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && task.TaskType == (int)TaskOutboundTypeEnum.Outbound &&
			(x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting \|\|
			x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish \|\| x.TaskState == (int)TaskOutStatusEnum.OutNew));
			var outJZTask = _taskRepository.QueryData(x => x.Roadway == task.Roadway && x.TaskType == (int)TaskOutboundTypeEnum.Outbound && (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting \|\| x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish \|\| x.TaskState == (int)TaskOutStatusEnum.OutNew));

			if (!outJZTask.Any())
			if (!outJZTask.Any() \|\| outJZTask.Count() == 0)
			{
			// 映射任务命令
			var taskCommand = MapTaskCommand(task, command);
			@@ -590,6 +591,8 @@

			// 更新任务状态
			_taskService.UpdateTaskStatusToNext(task);

			WriteInfo(conveyorLine.DeviceName, $"静置存在出库任务{outJZTask.Count()}");
			}
			else
			{